From patchwork Tue Apr 28 11:01:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1278393 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=wcvK65Vn; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49BJbx75f8z9sSG for ; Tue, 28 Apr 2020 21:01:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 76003203B5; Tue, 28 Apr 2020 11:01:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XR1omd3B-u0P; Tue, 28 Apr 2020 11:01:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C5E3722008; Tue, 28 Apr 2020 11:01:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 5BD021BF277 for ; Tue, 28 Apr 2020 11:01:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5859187FB5 for ; Tue, 28 Apr 2020 11:01:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tIvgRBgTVKT4 for ; Tue, 28 Apr 2020 11:01:08 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by hemlock.osuosl.org (Postfix) with ESMTPS id 988A187F8E for ; Tue, 28 Apr 2020 11:01:08 +0000 (UTC) Received: by mail-wr1-f43.google.com with SMTP id k1so24153165wrx.4 for ; Tue, 28 Apr 2020 04:01:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qc+OuSYE7Q9cfPSPG8Czg0HoctsjNzvBV5T1TSmwFlo=; b=wcvK65VnP9WY5QKbRkezPWcvHUbVCK1+ZBCT5vAC2q2GtNhLIyWaC6rRt0TE1dd9fM OMAy6GVnHV2vX2xXb7gZIELkXtl+Xkp0UCaTQf0Ty7+rC6TWdj7p4Vpac83RfTrQ8SK2 ZQ4UG4lBVtH7aTaox6/ABDdPgSC9XX4jEYOX0N610nK06mTb227XCVVviZaXlXhCZTeX XrxytAqN5j9jJfqPlXnDMfXxNCETA2nt7E4UPrf1HlrzT1V/ekum1r4hGROEI+GbuvQP n9E/2sN/gbigHOk3DkKR6g5Oc+2JAGR6vaTDQvX1Q5kIKXNznBnEkQDCF6+l96kub6/i 6YSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qc+OuSYE7Q9cfPSPG8Czg0HoctsjNzvBV5T1TSmwFlo=; b=Rmh14tLKi8XOeoqx1z+UYfLGJzvYQeH31B5ERSb/mudNqdnFgD2ZIaFvwWAt4yvzK1 aYJd7UtZ5/YfTRFE2i1i27ZRGiYnL7QykRUSqvgptNPm19ZqFFZQGFBayyv7ps1clZsD pSQzTeqKAGuVDR8HRYDXpbLCp6vC6DxCHWk2WfIhiPMXZNLJtLKdJm+vJOBuUYjn6zss O9IwJqvbtSRXXpfDiN45RnV8dZNklwrNm34VyVQTcfuBl4mOG70M+F8vfWt1cLouOLIF rwXHkPklHZ/uHXs2y8GmyvKlzIQQZvtFjP5ILuDhY/iEoboA8EnFAJgbLI4EeQ3z6Mnp If/w== X-Gm-Message-State: AGi0PubK5A6YX2znrmc35YLN88dTRAOwkiKwqS036Ziu4w4N/opbWvrP sngphH3CN7w+EkHJ9oL4JZ7TTwwEJgBu7w== X-Google-Smtp-Source: APiQypJeqt/rR3XLxuDVdtwlyI7bfVMRf5enKQi76wzCBfFik6u8xaXZ0wa28h3z9J8h9MiXp8wz8g== X-Received: by 2002:adf:ce0a:: with SMTP id p10mr31524055wrn.89.1588071666559; Tue, 28 Apr 2020 04:01:06 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:63d3:7700:5fb9:2a66:a7a8:378f]) by smtp.gmail.com with ESMTPSA id q17sm2713448wmj.45.2020.04.28.04.01.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 04:01:05 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Tue, 28 Apr 2020 13:01:01 +0200 Message-Id: <20200428110101.11716-1-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.25.3 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/luajit: bump to version 2.2.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Version 2.2.0 introduces Lua 5.3 and extends Lua 5.2 extensions, see https://github.com/moonjit/moonjit/releases/tag/2.2.0 Moonjit 2.2.0 replaced references to "LuaJIT" by "moonjit", which introduces some changes in the Makefile and COPYRIGHT. Also update the hash file to the new 2 spaces convention Signed-off-by: Titouan Christophe --- package/luajit/0001-no-bin-symlink.patch | 6 ++++-- package/luajit/0002-install-inc.patch | 6 ++++-- package/luajit/luajit.hash | 4 ++-- package/luajit/luajit.mk | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/package/luajit/0001-no-bin-symlink.patch b/package/luajit/0001-no-bin-symlink.patch index d32ec5ad60..3d45d51bb3 100644 --- a/package/luajit/0001-no-bin-symlink.patch +++ b/package/luajit/0001-no-bin-symlink.patch @@ -1,6 +1,8 @@ Do not use a symlink for the binary, simply name it luajit Signed-off-by: Thomas Petazzoni +[Titouan: update for 2.2.0] +Signed-off-by: Titouan Christophe Index: b/Makefile =================================================================== @@ -10,13 +12,13 @@ Index: b/Makefile INSTALL_MAN= $(INSTALL_SHARE)/man/man1 INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig --INSTALL_TNAME= luajit-$(VERSION) +-INSTALL_TNAME= moonjit-$(VERSION) -INSTALL_TSYMNAME= luajit +INSTALL_TNAME= luajit INSTALL_ANAME= libluajit-$(ABIVER).a INSTALL_SOSHORT1= libluajit-$(ABIVER).so INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER) -@@ -60,7 +59,6 @@ +@@ -60,7 +59,6 @@ INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME) INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1) INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2) INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) diff --git a/package/luajit/0002-install-inc.patch b/package/luajit/0002-install-inc.patch index 5f6547fc3f..d3c9f9431f 100644 --- a/package/luajit/0002-install-inc.patch +++ b/package/luajit/0002-install-inc.patch @@ -1,6 +1,8 @@ Install includes like lua's ones Signed-off-by: Francois Perrad +[Titouan: update for 2.2.0] +Signed-off-by: Titouan Christophe Index: b/Makefile =================================================================== @@ -10,8 +12,8 @@ Index: b/Makefile INSTALL_BIN= $(DPREFIX)/bin INSTALL_LIB= $(DPREFIX)/$(MULTILIB) INSTALL_SHARE= $(DPREFIX)/share --INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) +-INSTALL_INC= $(DPREFIX)/include/moonjit-$(MAJVER).$(MINVER) +INSTALL_INC= $(DPREFIX)/include - INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) + INSTALL_LJLIBD= $(INSTALL_SHARE)/moonjit-$(VERSION) INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash index 532ec0b294..9d41b85ef8 100644 --- a/package/luajit/luajit.hash +++ b/package/luajit/luajit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c3de8e29aa617fc594c043f57636ab9ad71af2b4a3a513932b05f5cdaa4320b2 luajit-2.1.2.tar.gz +sha256 83deb2c880488dfe7dd8ebf09e3b1e7613ef4b8420de53de6f712f01aabca2b6 luajit-2.2.0.tar.gz # Locally calculated -sha256 aa64a7706ded773011b933f4230d7b35ba662598197f82ac2c7bca62abdaa4d7 COPYRIGHT +sha256 8773ee802066bf8559b5d101cc096c1aff363cf9c53a1117268fe90eb09a16fb COPYRIGHT diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 68e6af4f5e..569f9e446d 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAJIT_VERSION = 2.1.2 +LUAJIT_VERSION = 2.2.0 LUAJIT_SITE = $(call github,moonjit,moonjit,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT