From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcel Lorenz To: development@lists.ipfire.org Subject: [PATCH] lua: update to 5.3.4 Date: Fri, 09 Jun 2017 19:42:07 +0200 Message-ID: <20170609174207.32507-1-marcel.lorenz@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3803960527137196588==" List-Id: --===============3803960527137196588== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://www.lua.org/work/ Signed-off-by: Marcel Lorenz --- lfs/lua | 5 ++- src/patches/lua-5.3.4-shared_library-1.patch | 61 ++++++++++++++++++++++++++= ++ 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 src/patches/lua-5.3.4-shared_library-1.patch diff --git a/lfs/lua b/lfs/lua index 6a6a959..505178d 100644 --- a/lfs/lua +++ b/lfs/lua @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 5.3.0 +VER =3D 5.3.4 =20 THISAPP =3D lua-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D a1b0a7e92d0c85bbff7a8d27bf29f8af +$(DL_FILE)_MD5 =3D 53a9c68bcc0eda58bdc2095ad5cdfc63 =20 install : $(TARGET) =20 @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && cp -v src/luaconf.h src/luaconf.h.template.in cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.3.0-autotoolize.= patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.3.4-shared_libra= ry-1.patch cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && ./configure --prefix=3D/usr cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/lua-5.3.4-shared_library-1.patch b/src/patches/lua-5= .3.4-shared_library-1.patch new file mode 100644 index 0000000..857fddc --- /dev/null +++ b/src/patches/lua-5.3.4-shared_library-1.patch @@ -0,0 +1,61 @@ +Submitted By: Igor =C5=BDivkovi=C4=87 +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.3.0.orig/Makefile lua-5.3.0/Makefile +--- lua-5.3.0.orig/Makefile 2014-10-30 00:14:41.000000000 +0100 ++++ lua-5.3.0/Makefile 2015-01-19 22:14:09.822290828 +0100 +@@ -52,7 +52,7 @@ + all: $(PLAT) +=20 + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=3D$(V) R=3D$(R) +=20 + test: dummy + src/lua -v +diff -Naur lua-5.3.0.orig/src/Makefile lua-5.3.0/src/Makefile +--- lua-5.3.0.orig/src/Makefile 2015-01-05 17:04:52.000000000 +0100 ++++ lua-5.3.0/src/Makefile 2015-01-19 22:14:52.559378543 +0100 +@@ -7,7 +7,7 @@ + PLAT=3D none +=20 + CC=3D gcc -std=3Dgnu99 +-CFLAGS=3D -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) ++CFLAGS=3D -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) + LDFLAGS=3D $(SYSLDFLAGS) $(MYLDFLAGS) + LIBS=3D -lm $(SYSLIBS) $(MYLIBS) +=20 +@@ -29,6 +29,7 @@ + PLATS=3D aix bsd c89 freebsd generic linux macosx mingw posix solaris +=20 + LUA_A=3D liblua.a ++LUA_SO=3D liblua.so + CORE_O=3D 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=3D luac.o +=20 + ALL_O=3D $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T=3D $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T=3D $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A=3D $(LUA_A) +=20 + # Targets start here. +@@ -59,6 +60,12 @@ + $(AR) $@ $(BASE_O) + $(RANLIB) $@ +=20 ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAG= S) ++ 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) +=20 --=20 2.9.3 --===============3803960527137196588==--