Re: [PATCH] lua: update to 5.3.4

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 4191 bytes --]

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/
> 
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> ---
>  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 @@
>  
>  include Config
>  
> -VER        = 5.3.0
> +VER        = 5.3.4
>  
>  THISAPP    = lua-$(VER)
>  DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = a1b0a7e92d0c85bbff7a8d27bf29f8af
> +$(DL_FILE)_MD5 = 53a9c68bcc0eda58bdc2095ad5cdfc63
>  
>  install : $(TARGET)
>  
> @@ -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_library-1.patch
>  	cd $(DIR_APP) && autoreconf -vfi
>  	cd $(DIR_APP) && ./configure --prefix=/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 Živković <contact(a)igor-zivkovic.from.hr>
> +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)
> + 
> + $(PLATS) clean:
> +-	cd src && $(MAKE) $@
> ++	cd src && $(MAKE) $@ V=$(V) R=$(R)
> + 
> + 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= none
> + 
> + CC= gcc -std=gnu99
> +-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
> ++CFLAGS= -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
> + LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
> + LIBS= -lm $(SYSLIBS) $(MYLIBS)
> + 
> +@@ -29,6 +29,7 @@
> + PLATS= aix bsd c89 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)
> + 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]