From 4365737dbb6cb18f01f83eb50d3b05df69c02239 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Sun, 14 Dec 2014 17:42:36 -0500 Subject: [PATCH] Upgrade to lua-5.2.3 --- config/packages-list | 2 +- stage5/patches/common/lua-5.2.3-rootdir.patch | 12 ++++ .../common/lua-5.2.3-shared_library-1.patch | 61 +++++++++++++++++++ stage5/pkg/lua | 40 +++++++++--- 4 files changed, 106 insertions(+), 9 deletions(-) create mode 100644 stage5/patches/common/lua-5.2.3-rootdir.patch create mode 100644 stage5/patches/common/lua-5.2.3-shared_library-1.patch diff --git a/config/packages-list b/config/packages-list index 0f3a65c..83fc302 100644 --- a/config/packages-list +++ b/config/packages-list @@ -260,7 +260,7 @@ LIGHTTPD="lighttpd-1.4.32" LILYPOND="lilypond-2.16.2" LLVM="llvm-3.1" LTSP_UTILS="ltsp-utils-0.25-0" -LUA="lua-5.1.4" +LUA="lua-5.2.3" LYNX="lynx2.8.8dev.10" LZO="lzo-2.06" LZOP="lzop-1.03" diff --git a/stage5/patches/common/lua-5.2.3-rootdir.patch b/stage5/patches/common/lua-5.2.3-rootdir.patch new file mode 100644 index 0000000..c1a96b3 --- /dev/null +++ b/stage5/patches/common/lua-5.2.3-rootdir.patch @@ -0,0 +1,12 @@ +diff -Naur lua-5.2.3.orig/src/luaconf.h lua-5.2.3.new/src/luaconf.h +--- lua-5.2.3.orig/src/luaconf.h 2013-04-12 14:48:47.000000000 -0400 ++++ lua-5.2.3.new/src/luaconf.h 2014-12-26 12:50:09.098342516 -0500 +@@ -100,7 +100,7 @@ + #else /* }{ */ + + #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR + #define LUA_PATH_DEFAULT \ diff --git a/stage5/patches/common/lua-5.2.3-shared_library-1.patch b/stage5/patches/common/lua-5.2.3-shared_library-1.patch new file mode 100644 index 0000000..a37fd64 --- /dev/null +++ b/stage5/patches/common/lua-5.2.3-shared_library-1.patch @@ -0,0 +1,61 @@ +Submitted By: Igor Živković +Date: 2013-06-19 +Initial Package Version: 5.2.2 +Upstream Status: Rejected +Origin: Arch Linux packages repository +Description: Adds the compilation of a shared library. + +diff -Naur lua-5.2.2.orig/Makefile lua-5.2.2/Makefile +--- lua-5.2.2.orig/Makefile 2012-05-17 16:05:54.000000000 +0200 ++++ lua-5.2.2/Makefile 2013-06-19 20:04:12.338167412 +0200 +@@ -52,7 +52,7 @@ + all: $(PLAT) + + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + test: dummy + src/lua -v +diff -Naur lua-5.2.2.orig/src/Makefile lua-5.2.2/src/Makefile +--- lua-5.2.2.orig/src/Makefile 2012-12-27 11:51:43.000000000 +0100 ++++ lua-5.2.2/src/Makefile 2013-06-19 20:04:40.924213226 +0200 +@@ -7,7 +7,7 @@ + PLAT= none + + CC= gcc +-CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) ++CFLAGS= -fPIC -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) + LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) + LIBS= -lm $(SYSLIBS) $(MYLIBS) + +@@ -29,6 +29,7 @@ + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -43,7 +44,7 @@ + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -59,6 +60,12 @@ + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + diff --git a/stage5/pkg/lua b/stage5/pkg/lua index f84210e..b0cebae 100644 --- a/stage5/pkg/lua +++ b/stage5/pkg/lua @@ -3,16 +3,40 @@ hvbuild() { cd ${LFS_TMP}/${PACKAGE} - make CPPFLAGS="-fPIC" linux - make INSTALL_TOP=/usr install - -# Pour lua plus récent (éliminer hvbuild_post): -# make INSTALL_TOP=/usr pc > /usr/lib/pkgconfig/lua.pc + make linux + make INSTALL_TOP=/usr \ + TO_LIB="liblua.so liblua.so.5.2 liblua.so.5.2.3" \ + INSTALL_DATA="cp -d" \ + INSTALL_MAN=/usr/share/man/man1 \ + install } hvbuild_post() { - sed -i 's@/usr/local@/usr@g' etc/lua.pc - cp etc/lua.pc /usr/lib/pkgconfig - cp etc/lua.ico /usr/share/icons + cat > /usr/lib/pkgconfig/lua.pc << "EOF" +V=_V_ +R=_R_ + +prefix=/usr +INSTALL_BIN=${prefix}/bin +INSTALL_INC=${prefix}/include +INSTALL_LIB=${prefix}/lib +INSTALL_MAN=${prefix}/man/man1 +INSTALL_LMOD=${prefix}/share/lua/${V} +INSTALL_CMOD=${prefix}/lib/lua/${V} +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Lua +Description: An Extensible Extension Language +Version: ${R} +Requires: +Libs: -L${libdir} -llua -lm +Cflags: -I${includedir} +EOF + + sed -e "s@_V_@$(get_pkg_ver2 ${PACKAGE})@g" \ + -e "s@_R_@$(get_pkg_ver ${PACKAGE})@g" \ + -i /usr/lib/pkgconfig/lua.pc } -- 2.20.1