From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] lua: update to 5.3.4 Date: Wed, 14 Jun 2017 22:35:04 +0100 Message-ID: <1497476104.2416.23.camel@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5888915271338998393==" List-Id: --===============5888915271338998393== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Okay, please send that when ever the next merge window opens. Best, -Michael On Wed, 2017-06-14 at 14:53 +0200, Marcel Lorenz wrote: > Hi, >=20 > i have this tested an this patch is not necessary. > I make a new patch without... >=20 > Best, > Marcel >=20 >=20 > Am 2017-06-12 19:25, schrieb Michael Tremer: > > Hi, > >=20 > > if this patch is supposed to add a shared library, then the > > rootfile=C2=A0 > > needs to be > > updated. > >=20 > > If not, then the patch is not necessary. > >=20 > > Best, > > -Michael > >=20 > > On Fri, 2017-06-09 at 19:42 +0200, Marcel Lorenz wrote: > > > https://www.lua.org/work/ > > >=20 > > > Signed-off-by: Marcel Lorenz > > > --- > > > =C2=A0lfs/lua=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A05 ++- > > > =C2=A0src/patches/lua-5.3.4-shared_library-1.patch | 61 > > > ++++++++++++++++++++++++++++ > > > =C2=A02 files changed, 64 insertions(+), 2 deletions(-) > > > =C2=A0create mode 100644 src/patches/lua-5.3.4-shared_library-1.patch > > >=20 > > > diff --git a/lfs/lua b/lfs/lua > > > index 6a6a959..505178d 100644 > > > --- a/lfs/lua > > > +++ b/lfs/lua > > > @@ -24,7 +24,7 @@ > > > =C2=A0 > > > =C2=A0include Config > > > =C2=A0 > > > -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 5.3.0 > > > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 5.3.4 > > > =C2=A0 > > > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D lua-$(VER) > > > =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.gz > > > @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) > > > =C2=A0 > > > =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > > > =C2=A0 > > > -$(DL_FILE)_MD5 =3D a1b0a7e92d0c85bbff7a8d27bf29f8af > > > +$(DL_FILE)_MD5 =3D 53a9c68bcc0eda58bdc2095ad5cdfc63 > > > =C2=A0 > > > =C2=A0install : $(TARGET) > > > =C2=A0 > > > @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst > > > %,$(DIR_DL)/%,$(objects)) > > > =C2=A0 @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf > > > $(DIR_DL)/$(DL_FILE) > > > =C2=A0 cd $(DIR_APP) && cp -v src/luaconf.h > > > src/luaconf.h.template.in > > > =C2=A0 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_library-1.patch > > > =C2=A0 cd $(DIR_APP) && autoreconf -vfi > > > =C2=A0 cd $(DIR_APP) && ./configure --prefix=3D/usr > > > =C2=A0 cd $(DIR_APP) && make $(MAKETUNING) > > > diff --git a/src/patches/lua-5.3.4-shared_library-1.patch=C2=A0 > > > 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:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0Igor =C5=BDivkovi=C4=87=C2=A0 > > > > > > +Date:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A02013-06-19 > > > +Initial Package Version: 5.2.2 > > > +Upstream Status:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= Rejected > > > +Origin:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Arch Linux packages repository > > > +Description:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0Adds 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) > > > +=C2=A0 > > > + $(PLATS) clean: > > > +- cd src && $(MAKE) $@ > > > ++ cd src && $(MAKE) $@ V=3D$(V) R=3D$(R) > > > +=C2=A0 > > > + test: dummy > > > +=C2=A0 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 > > > +=C2=A0 > > > + 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)=C2=A0 > > > $(MYCFLAGS) > > > + LDFLAGS=3D $(SYSLDFLAGS) $(MYLDFLAGS) > > > + LIBS=3D -lm $(SYSLIBS) $(MYLIBS) > > > +=C2=A0 > > > +@@ -29,6 +29,7 @@ > > > + PLATS=3D aix bsd c89 freebsd generic linux macosx mingw posix > > > solaris > > > +=C2=A0 > > > + 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 \ > > > +=C2=A0 lmem.o lobject.o lopcodes.o lparser.o lstate.o > > > lstring.o ltable.o \ > > > +=C2=A0 ltm.o lundump.o lvm.o lzio.o > > > +@@ -43,7 +44,7 @@ > > > + LUAC_O=3D luac.o > > > +=C2=A0 > > > + 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) > > > +=C2=A0 > > > + # Targets start here. > > > +@@ -59,6 +60,12 @@ > > > +=C2=A0 $(AR) $@ $(BASE_O) > > > +=C2=A0 $(RANLIB) $@ > > > +=C2=A0 > > > ++$(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) > > > +=C2=A0 $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) > > > +=C2=A0 >=20 >=20 --===============5888915271338998393== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlpRYXdJQUFvSkVJQjU4UDl2a0FrSC8ya1FBTEJBU0xieFFPMVY3UTNtSmFBcDJLMzMK enF1ekc1aTkva1k4bG9rNWhxM0plRHRtMyszb0M2T29mL29RRXIzTDh3NDM2OTlORU5XQkJmSXRh VWV5L2lSeApNSFUxTXVETnVKd05nUkcwcEV0ZUJMVUM0c0VGcllmK2lkUFRRMDVVU0hTZ2lobk1m VmxKcnRpRzZJM0oyb2FYCkgwWHdwTk52eUJPR1dKOWRGOTJVc29iclkveEMyN2EwUEdKc0lZWHhO OWw2dTliQTJ6MkcyZ0lDRGVPd2c2U1gKYzZpV1N5dGdCQXJuaGpLTnc2dlA4Q0FwcUkvcE5wZ3cw eGt2MjY1ZkltSzVrTDdhRmxFY2xHSVlqbnhkVGs5Wgp4YktDNVl4OFdhQ3RaVUZNQitXbzNsUFJk VTJOUVFtbStpY2pzV3hML0tNNVZpUS9uckxXTUMrc0tXeHVjeUlyCmYyQmMxQklKWjFTWEg5UHpn cUpBOGE0cE5Kc2pzcEZPaW1QYlpiTE50TEJWdVZQV09yZkhmUmVaeXFZUXk0OUsKRzVnKytmT0xZ azh3NlFDRWhGTGVRWml6eWtWMGl2ZmQ3QWpXamYrU1NWdkh4LzUrQVgwRXlGaVhTYi9Gbk9nVQow b2I3b0MyQmY2Q1BDRUE2ZTdYK29JM3NqRmU5ZnRuOXFLYnYzdUhVWEw0QzFxRDNJVlFlalBXTHhH aU9kNE1tCmhNaEVPMUo3Rlo3QjN1TFg5MGUycnA2bUt6OWtvbjhoM0UwUEZ4anRLU01oZnQzUTVw aVZjdXMyay9HdXlzQmIKT2ppQ3NsdW9GVGJ3T2tHZmNFMTgxRlVCYWM2aU1OR2NyMEF0eFVCTzZH ZEpIQkExendPK1d4dWhhczdyRzhqTQpITFVkVGQ3Wk02eVBLOGJWem1pTAo9cFNFSQotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============5888915271338998393==--