From patchwork Sat Jun 2 08:49:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 162404 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 997CDB7012 for ; Sat, 2 Jun 2012 18:49:22 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 68B1B8160B; Sat, 2 Jun 2012 08:49:20 +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 p7BRTX0fIlnm; Sat, 2 Jun 2012 08:49:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0C91B814ED; Sat, 2 Jun 2012 08:49:19 +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 BCEDD8F753 for ; Sat, 2 Jun 2012 08:49:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9478B80A2E for ; Sat, 2 Jun 2012 08:49:17 +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 El4NKFANa4+1 for ; Sat, 2 Jun 2012 08:49:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7A2C38160E for ; Sat, 2 Jun 2012 08:49:16 +0000 (UTC) Received: by wejx9 with SMTP id x9so3815754wej.16 for ; Sat, 02 Jun 2012 01:49:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:content-type:x-gm-message-state; bh=+3w6H44Z2HuScZFZcxYAWaOaJaGHtOTyHtLWd5eDRnY=; b=OjCSGcbOjPgMDKWC7GE82zciZ6BbiLgFo/oK8QR0Uzacfp/58bQYj69t5BMZTIpbPH ufqMUEfrSbOM9ibez2OlRv6KBfy+N77rL2VqUeVOsWbVx3NEB9NeVxfofPWolbqHQKMk BJ9fk6Yt/Kj7vPBTbefDOQ5D/e6RAF8j44gGF7NF2ZsxoQhhYMq0cpLshEc2fTxX6+xH DZVgldbx2+FDGRleJNgeiV1Y5jRJRfkMPsqxOG5t5CcD75zAO/X7BZ0Dez+7ffGt5sLb 1uG1Zabu1V1h6RiixmJIR5dnLIkgAQFFNsoZzerI7V99X1XX3va0oJp8rnDghMSgEzYl ooZw== MIME-Version: 1.0 Received: by 10.216.198.14 with SMTP id u14mr4649568wen.12.1338626954534; Sat, 02 Jun 2012 01:49:14 -0700 (PDT) Received: by 10.223.13.197 with HTTP; Sat, 2 Jun 2012 01:49:14 -0700 (PDT) Date: Sat, 2 Jun 2012 10:49:14 +0200 X-Google-Sender-Auth: lLleNKCpVZP59L10XfpquLmco24 Message-ID: From: =?ISO-8859-1?Q?Fran=E7ois_Perrad?= To: buildroot@busybox.net X-Gm-Message-State: ALoCoQnrKh3NzlaqlPbKHPuqKvdENdwnO0uA3c7EAwExgATK2r8aaHrbGz9UPWnb0R+0CzMXXjW0 Subject: [Buildroot] [PATCH] luajit: new package (v2) 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Francois Perrad --- package/Config.in | 3 ++- package/luajit/Config.in | 9 +++++++ package/luajit/luajit-root-path.patch | 16 ++++++++++++ package/luajit/luajit.mk | 44 +++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 package/luajit/Config.in create mode 100644 package/luajit/luajit-root-path.patch create mode 100644 package/luajit/luajit.mk + +$(eval $(call GENTARGETS,package,luajit)) diff --git a/package/Config.in b/package/Config.in index fb1b08f..fde30b0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -237,7 +237,8 @@ endmenu menu "Interpreter languages and scripting" source "package/haserl/Config.in" source "package/lua/Config.in" -if BR2_PACKAGE_LUA +source "package/luajit/Config.in" +if BR2_PACKAGE_LUA || BR2_PACKAGE_LUAJIT menu "LUA libraries/modules" source "package/cgilua/Config.in" source "package/copas/Config.in" diff --git a/package/luajit/Config.in b/package/luajit/Config.in new file mode 100644 index 0000000..c665b28 --- /dev/null +++ b/package/luajit/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LUAJIT + bool "luajit" + help + LuaJIT implements the full set of language features defined by Lua 5.1. The + virtual machine (VM) is API- and ABI-compatible to the standard Lua interpreter + and can be deployed as a drop-in replacement. + + http://luajit.org/ + diff --git a/package/luajit/luajit-root-path.patch b/package/luajit/luajit-root-path.patch new file mode 100644 index 0000000..2eb037c --- /dev/null +++ b/package/luajit/luajit-root-path.patch @@ -0,0 +1,16 @@ +diff -Naur LuaJIT-2.0.0-beta10.orig/src/luaconf.h LuaJIT-2.0.0-beta10/src/luaconf.h +--- LuaJIT-2.0.0-beta10.orig/src/luaconf.h 2012-05-30 20:33:27.989333819 +0200 ++++ LuaJIT-2.0.0-beta10/src/luaconf.h 2012-05-30 20:46:30.581354777 +0200 +@@ -22,9 +22,9 @@ + #define LUA_CPATH_DEFAULT \ + ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" + #else +-#define LUA_ROOT "/usr/local/" +-#define LUA_LDIR LUA_ROOT "share/lua/5.1/" +-#define LUA_CDIR LUA_ROOT "lib/lua/5.1/" ++#define LUA_ROOT "/usr/" ++#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-beta10/" + #define LUA_XPATH \ diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk new file mode 100644 index 0000000..b91ddbc --- /dev/null +++ b/package/luajit/luajit.mk @@ -0,0 +1,44 @@ +############################################################# +# +# luajit +# +############################################################# + +LUAJIT_VERSION = 2.0.0-beta10 +LUAJIT_SOURCE:=LuaJIT-$(LUAJIT_VERSION).tar.gz +LUAJIT_SITE = http://luajit.org/download +LUAJIT_INSTALL_STAGING = YES + +define LUAJIT_INSTALL_BETA_FIX_MAKEFILE + $(SED) 's/@echo " $$(SYMLINK) $$(INSTALL_TNAME) $$(INSTALL_TSYM)"/$$(SYMLINK) $$(INSTALL_TNAME) $$(INSTALL_TSYM)/' $(@D)/Makefile +endef + +ifeq ($(findstring beta,$(LUAJIT_VERSION)),beta) +LUAJIT_POST_PATCH_HOOKS += LUAJIT_INSTALL_BETA_FIX_MAKEFILE +endif + +define LUAJIT_NOLARGEFILE_FIX_MAKEFILE + $(SED) 's/TARGET_XCFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/TARGET_XCFLAGS=/' $(@D)/src/Makefile +endef + +ifneq ($(BR2_LARGEFILE),y) +LUAJIT_POST_PATCH_HOOKS += LUAJIT_NOLARGEFILE_FIX_MAKEFILE +endif + +define LUAJIT_BUILD_CMDS + $(MAKE) PREFIX="/usr" CROSS="$(TARGET_CROSS)" -C $(@D) amalg +endef + +define LUAJIT_INSTALL_STAGING_CMDS + $(MAKE) PREFIX="/usr" DESTDIR="$(STAGING_DIR)" -C $(@D) install +endef + +define LUAJIT_INSTALL_TARGET_CMDS + $(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" -C $(@D) install +endef + +define LUAJIT_CLEAN_CMDS + -$(MAKE) -C $(@D) clean +endef