From patchwork Mon Dec 3 16:12:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 203392 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id ACA312C007E for ; Tue, 4 Dec 2012 03:13:44 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3E4958AE8B; Mon, 3 Dec 2012 16:13:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZoyjrptVSjaA; Mon, 3 Dec 2012 16:13:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id EB99D89969; Mon, 3 Dec 2012 16:13:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AB11E8F74A for ; Mon, 3 Dec 2012 16:13:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C662D8AE8C for ; Mon, 3 Dec 2012 16:13:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cCb+566eAQde for ; Mon, 3 Dec 2012 16:13:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7F8D9816C1 for ; Mon, 3 Dec 2012 16:13:06 +0000 (UTC) Received: by mail-wi0-f171.google.com with SMTP id hn14so1268030wib.10 for ; Mon, 03 Dec 2012 08:13:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=cSlkby7SoS2+8hb8aJ5Bc1R8qD0TsBrz/2YHplRFt1k=; b=rgyTQJdypNvEL0vnjjEu3ieRJp987yvE4BI7Mnu7D8h0qStSk1rII7Nc9kBMt7fGvr IQQgukz/ErC7zwARPHqsDRgGOWM4mzDATXAmIAyCN2xEnv/LeAQg5rKVOWOLzPRyOqZS yrOz1iCzghng8CpJEp4kI2XzyqY/kvi0NbPdcTziWC92UYB+zOBdu+00+S5f9AN+k2Ll 4KyBVAX1XvK4LVwLryu34fEpYqcbHZ4rwVbF8xeB7rqlRDdnlT7saPyrCV7062lMrsTe ENDgIfuU1XHVFRYfOSU/jX+7Gd+oQBEHeTpQjMtdGj/ebPF/SHu8xttgoN86b9A7gdgc JEbA== Received: by 10.180.20.109 with SMTP id m13mr10491033wie.16.1354551184416; Mon, 03 Dec 2012 08:13:04 -0800 (PST) Received: from xubuntu-12.04 (239.141.193.77.rev.sfr.net. [77.193.141.239]) by mx.google.com with ESMTPS id bz12sm13157179wib.5.2012.12.03.08.13.02 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Dec 2012 08:13:03 -0800 (PST) From: Francois Perrad To: buildroot@busybox.net Date: Mon, 3 Dec 2012 17:12:12 +0100 Message-Id: <1354551135-30056-2-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1354551135-30056-1-git-send-email-francois.perrad@gadz.org> References: <1354551135-30056-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH 2/4] luajit: bump to version 2.0.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Francois Perrad --- package/luajit/luajit-01-root-path.patch | 2 +- package/luajit/luajit-04-no-bin-symlink.patch | 18 ++---------------- package/luajit/luajit.mk | 2 +- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/package/luajit/luajit-01-root-path.patch b/package/luajit/luajit-01-root-path.patch index 80ad1e9..cc2f04f 100644 --- a/package/luajit/luajit-01-root-path.patch +++ b/package/luajit/luajit-01-root-path.patch @@ -18,5 +18,5 @@ Index: b/src/luaconf.h +#define LUA_LDIR LUA_ROOT "share/lua/" +#define LUA_CDIR LUA_ROOT "lib/lua/" #ifdef LUA_XROOT - #define LUA_JDIR LUA_XROOT "share/luajit-2.0.0-beta11/" + #define LUA_JDIR LUA_XROOT "share/luajit-2.0.0/" #define LUA_XPATH \ diff --git a/package/luajit/luajit-04-no-bin-symlink.patch b/package/luajit/luajit-04-no-bin-symlink.patch index 91a470a..0de3162 100644 --- a/package/luajit/luajit-04-no-bin-symlink.patch +++ b/package/luajit/luajit-04-no-bin-symlink.patch @@ -6,7 +6,7 @@ Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -43,8 +43,7 @@ +@@ -42,8 +42,7 @@ INSTALL_MAN= $(INSTALL_SHARE)/man/man1 INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig @@ -16,7 +16,7 @@ Index: b/Makefile INSTALL_ANAME= libluajit-$(ABIVER).a INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) INSTALL_SOSHORT= libluajit-$(ABIVER).so -@@ -58,7 +57,6 @@ +@@ -57,7 +56,6 @@ INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) @@ -24,17 +24,3 @@ Index: b/Makefile INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ -@@ -120,13 +118,6 @@ - $(RM) $(FILE_PC).tmp - cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC) - cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB) -- @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ====" -- @echo "" -- @echo "Note: the beta releases deliberately do NOT install a symlink for luajit" -- @echo "You can do this now by running this command (with sudo):" -- @echo "" -- @echo " $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)" -- @echo "" - - uninstall: - @echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ====" diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 2583f92..844122e 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,7 +4,7 @@ # ############################################################# -LUAJIT_VERSION = 2.0.0-beta11 +LUAJIT_VERSION = 2.0.0 LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz LUAJIT_SITE = http://luajit.org/download LUAJIT_LICENSE = MIT