summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois Perrad <fperrad@gmail.com>2012-12-03 06:12:12 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-12-05 16:37:32 (GMT)
commitfa0cea21cdee6c5ac46fba3cceb989419083a432 (patch)
tree79995e392ed3a713c715da0cd7ca82ea5a6fbb7d
parentf44221c4598e3f5d96b7004b6b3fdb42edc08b0e (diff)
downloadbuildroot-fa0cea21cdee6c5ac46fba3cceb989419083a432.tar.gz
buildroot-fa0cea21cdee6c5ac46fba3cceb989419083a432.tar.bz2
luajit: bump to version 2.0.0
Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/luajit/luajit-01-root-path.patch2
-rw-r--r--package/luajit/luajit-04-no-bin-symlink.patch18
-rw-r--r--package/luajit/luajit.mk2
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