From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] lua: update to 5.3.4
Date: Mon, 12 Jun 2017 18:25:13 +0100
Message-ID: <1497288313.21214.26.camel@ipfire.org>
In-Reply-To: <20170609174207.32507-1-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2922785913202730064=="
List-Id: <development.lists.ipfire.org>

--===============2922785913202730064==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi,

if this patch is supposed to add a shared library, then the rootfile needs to=
 be
updated.

If not, then the patch is not necessary.

Best,
-Michael

On Fri, 2017-06-09 at 19:42 +0200, Marcel Lorenz wrote:
> https://www.lua.org/work/
>=20
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> ---
> =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 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 <contact(a)igor-zivkovic.from.hr>
> +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=A0Reje=
cted
> +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) $(MYCFLAG=
S)
> + 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

--===============2922785913202730064==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlpQczU1QUFvSkVJQjU4UDl2a0FrSHZCSVFBSVhJSEZLL0YxV1k4MVpEcEdOeTB6aGwK
amFUMFdDSGVHQnRVOHllYzF0akhGWjZsTU5pYWR4YURrSzFhenI2VUtpWEVhMzh3YitTN2NReklw
R2hDWFllNgpjeXN1Y3UvSHpEb2drY2tQcnV0T1Y5a1JNK29qSXZFRWZjYVdaVFRXN0RVMFRrN01N
K2hOdDZBc2ZjTDBZWlNGCjV6MTlwRUJHRFhVZis1TlBCLzhzbEpnYUdHb05GbnF6bW51NGpWeWxU
a0lGTS9xZXhPSElsc1hOQklUUFp0ZUQKNXpBYmhPUi94OG4zaXc1elRyWmdDOEpUZ2tkb3gyaUpK
YXUzNjlvMGxDL2NOeThTT1hIdFQxcVpDcWNUa1o1MQpiK0hXTFBCVFZ3K21uU2pzb0JkNHUzTUg4
WlFYL3puQ0lUek5pTDBDTllmNG1DTzNFbUtxbFFId2xlcFFldEE5ClFWR0pMeDQ2djZ6K3RQZUpk
QUQ2NGxCYm5KcndRY3RNcys5Z2FWdzBrcEx1c1pwaE1yVnB5QnFkOEVBM2gxemIKRnZNd3lZTEZZ
ZFkyMWRjS3hSdEFwK0tSUUlJSzJJMmQ5N2JMYmpSdDhKbmtCU2RXa3Z6OU16STJESDVGYjNPUwpa
THY5R2VtN2tCciszL3ZncmtOaTB6VHR5V3BNT0dJNktoK1drcDVJSDhqTXhxa2N4SjBvbElyZ2o2
QjhOaUZ3CkExZEhVamdYRzNiQUF5ODQra1hiM3VXV05Dak1LU2h1KzlpeTMvbzBTSmxKRGtGck16
T3hqTWtESThCbHhqbncKdEV1K0NUbTh1THUxL0QzTW5SOGdvQkR2ZjJyZkF1cUZrckpvMk5VeE5z
a2FLZmdoQTBwVFBodGk3bS8wL2tqKwpvdE12d1gzanFXQ0NNbzU1ek5kWAo9THNkTgotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============2922785913202730064==--