wok-next rev 19808
Up lua (5.3.4), luafilesystem (1.6.3)
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sat Jul 15 14:17:09 2017 +0300 (2017-07-15) |
parents | a554e9f9d731 |
children | bd61370c8ddc |
files | lua-dev/receipt lua/receipt lua/stuff/lua-5.3.3-shared_library-1.patch lua/stuff/lua.pc lua/stuff/patches/lua-5.3.4-shared_library-1.patch lua/stuff/patches/series luafilesystem/receipt |
line diff
1.1 --- a/lua-dev/receipt Sat Jul 15 12:26:33 2017 +0200 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,18 +0,0 @@ 1.4 -# SliTaz package receipt. 1.5 - 1.6 -PACKAGE="lua-dev" 1.7 -VERSION="5.3.3" 1.8 -CATEGORY="development" 1.9 -SHORT_DESC="Lua devel files." 1.10 -MAINTAINER="pankso@slitaz.org" 1.11 -LICENSE="MIT" 1.12 -WEB_SITE="https://www.lua.org/" 1.13 -HOST_ARCH="i486 arm" 1.14 - 1.15 -WANTED="lua" 1.16 - 1.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.18 -genpkg_rules() 1.19 -{ 1.20 - copy *.h* *.pc *.so* # Lua binaries not depends on *.so, so put here 1.21 -}
2.1 --- a/lua/receipt Sat Jul 15 12:26:33 2017 +0200 2.2 +++ b/lua/receipt Sat Jul 15 14:17:09 2017 +0300 2.3 @@ -1,9 +1,9 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="lua" 2.8 -VERSION="5.3.3" 2.9 +VERSION="5.3.4" 2.10 CATEGORY="development" 2.11 -SHORT_DESC="Powerful, fast, light-weight, embeddable scripting language." 2.12 +SHORT_DESC="Powerful, fast, light-weight, embeddable scripting language" 2.13 MAINTAINER="pankso@slitaz.org" 2.14 LICENSE="MIT" 2.15 WEB_SITE="https://www.lua.org/" 2.16 @@ -12,14 +12,13 @@ 2.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.18 WGET_URL="https://www.lua.org/ftp/$TARBALL" 2.19 2.20 -DEPENDS="readline ncurses" 2.21 BUILD_DEPENDS="readline-dev" 2.22 +SPLIT="liblua lua-dev" 2.23 2.24 # Rules to configure and make the package. 2.25 compile_rules() 2.26 { 2.27 - patch -Np1 -i $stuff/lua-5.3.3-shared_library-1.patch 2.28 - sed -i '/#define LUA_ROOT/s|/usr/local/|/usr/|' src/luaconf.h 2.29 + sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h && 2.30 2.31 case "$ARCH" in 2.32 arm) 2.33 @@ -33,27 +32,37 @@ 2.34 2.35 make \ 2.36 INSTALL_TOP=$DESTDIR/usr \ 2.37 - TO_LIB="liblua.so liblua.so.${VERSION%.*} liblua.so.$VERSION" \ 2.38 INSTALL_DATA="cp -d" \ 2.39 INSTALL_MAN=$DESTDIR/usr/share/man/man1 \ 2.40 + TO_LIB="liblua.so liblua.so.${VERSION%.*} liblua.so.$VERSION" \ 2.41 install && 2.42 2.43 - mkdir -p $install/usr/share/doc/lua-$VERSION 2.44 - cp -a doc/* $install/usr/share/doc/lua-$VERSION 2.45 - rm $install/usr/share/doc/lua-$VERSION/*.1 2.46 + docdir="$install/usr/share/doc/lua-$VERSION" && 2.47 + mkdir -p $docdir && 2.48 + cp -a doc/* $docdir && rm $docdir/*.1 && 2.49 2.50 - mkdir -p $install/usr/lib/pkgconfig 2.51 + mkdir -p $install/usr/lib/pkgconfig && 2.52 cp $stuff/lua.pc $install/usr/lib/pkgconfig 2.53 } 2.54 2.55 +testsuite() { 2.56 + readelf -h $install/usr/bin/lua 2.57 +} 2.58 + 2.59 # Rules to gen a SliTaz package suitable for Tazpkg. 2.60 genpkg_rules() 2.61 { 2.62 - mkdir -p $fs/usr/bin 2.63 - cp -a $install/usr/bin $fs/usr 2.64 + case $PACKAGE in 2.65 + lua) 2.66 + copy bin/ 2.67 + DEPENDS="ncurses readline" 2.68 + ;; 2.69 + liblua) 2.70 + copy *.so* 2.71 + CAT="libs|library" 2.72 + ;; 2.73 + *-dev) 2.74 + copy @dev 2.75 + ;; 2.76 + esac 2.77 } 2.78 - 2.79 -testsuite() 2.80 -{ 2.81 - readelf -h $install/usr/bin/lua 2.82 -}
3.1 --- a/lua/stuff/lua-5.3.3-shared_library-1.patch Sat Jul 15 12:26:33 2017 +0200 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,61 +0,0 @@ 3.4 -Submitted By: Igor Živković <contact@igor-zivkovic.from.hr> 3.5 -Date: 2013-06-19 3.6 -Initial Package Version: 5.2.2 3.7 -Upstream Status: Rejected 3.8 -Origin: Arch Linux packages repository 3.9 -Description: Adds the compilation of a shared library. 3.10 - 3.11 -diff -Naur lua-5.3.0.orig/Makefile lua-5.3.0/Makefile 3.12 ---- lua-5.3.0.orig/Makefile 2014-10-30 00:14:41.000000000 +0100 3.13 -+++ lua-5.3.0/Makefile 2015-01-19 22:14:09.822290828 +0100 3.14 -@@ -52,7 +52,7 @@ 3.15 - all: $(PLAT) 3.16 - 3.17 - $(PLATS) clean: 3.18 -- cd src && $(MAKE) $@ 3.19 -+ cd src && $(MAKE) $@ V=$(V) R=$(R) 3.20 - 3.21 - test: dummy 3.22 - src/lua -v 3.23 -diff -Naur lua-5.3.0.orig/src/Makefile lua-5.3.0/src/Makefile 3.24 ---- lua-5.3.0.orig/src/Makefile 2015-01-05 17:04:52.000000000 +0100 3.25 -+++ lua-5.3.0/src/Makefile 2015-01-19 22:14:52.559378543 +0100 3.26 -@@ -7,7 +7,7 @@ 3.27 - PLAT= none 3.28 - 3.29 - CC= gcc -std=gnu99 3.30 --CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) 3.31 -+CFLAGS= -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) 3.32 - LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) 3.33 - LIBS= -lm $(SYSLIBS) $(MYLIBS) 3.34 - 3.35 -@@ -29,6 +29,7 @@ 3.36 - PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris 3.37 - 3.38 - LUA_A= liblua.a 3.39 -+LUA_SO= liblua.so 3.40 - CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ 3.41 - lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ 3.42 - ltm.o lundump.o lvm.o lzio.o 3.43 -@@ -43,7 +44,7 @@ 3.44 - LUAC_O= luac.o 3.45 - 3.46 - ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) 3.47 --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) 3.48 -+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) 3.49 - ALL_A= $(LUA_A) 3.50 - 3.51 - # Targets start here. 3.52 -@@ -59,6 +60,12 @@ 3.53 - $(AR) $@ $(BASE_O) 3.54 - $(RANLIB) $@ 3.55 - 3.56 -+$(LUA_SO): $(CORE_O) $(LIB_O) 3.57 -+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) 3.58 -+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) 3.59 -+ ln -sf $(LUA_SO).$(R) $(LUA_SO) 3.60 -+ 3.61 -+ 3.62 - $(LUA_T): $(LUA_O) $(LUA_A) 3.63 - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) 3.64 -
4.1 --- a/lua/stuff/lua.pc Sat Jul 15 12:26:33 2017 +0200 4.2 +++ b/lua/stuff/lua.pc Sat Jul 15 14:17:09 2017 +0300 4.3 @@ -1,5 +1,5 @@ 4.4 V=5.3 4.5 -R=5.3.3 4.6 +R=5.3.4 4.7 4.8 prefix=/usr 4.9 INSTALL_BIN=${prefix}/bin 4.10 @@ -16,5 +16,5 @@ 4.11 Description: An Extensible Extension Language 4.12 Version: ${R} 4.13 Requires: 4.14 -Libs: -L${libdir} -llua -lm 4.15 +Libs: -L${libdir} -llua -lm -ldl 4.16 Cflags: -I${includedir}
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/lua/stuff/patches/lua-5.3.4-shared_library-1.patch Sat Jul 15 14:17:09 2017 +0300 5.3 @@ -0,0 +1,61 @@ 5.4 +Submitted By: Igor Živković <contact@igor-zivkovic.from.hr> 5.5 +Date: 2013-06-19 5.6 +Initial Package Version: 5.2.2 5.7 +Upstream Status: Rejected 5.8 +Origin: Arch Linux packages repository 5.9 +Description: Adds the compilation of a shared library. 5.10 + 5.11 +diff -Naur lua-5.3.0.orig/Makefile lua-5.3.0/Makefile 5.12 +--- lua-5.3.0.orig/Makefile 2014-10-30 00:14:41.000000000 +0100 5.13 ++++ lua-5.3.0/Makefile 2015-01-19 22:14:09.822290828 +0100 5.14 +@@ -52,7 +52,7 @@ 5.15 + all: $(PLAT) 5.16 + 5.17 + $(PLATS) clean: 5.18 +- cd src && $(MAKE) $@ 5.19 ++ cd src && $(MAKE) $@ V=$(V) R=$(R) 5.20 + 5.21 + test: dummy 5.22 + src/lua -v 5.23 +diff -Naur lua-5.3.0.orig/src/Makefile lua-5.3.0/src/Makefile 5.24 +--- lua-5.3.0.orig/src/Makefile 2015-01-05 17:04:52.000000000 +0100 5.25 ++++ lua-5.3.0/src/Makefile 2015-01-19 22:14:52.559378543 +0100 5.26 +@@ -7,7 +7,7 @@ 5.27 + PLAT= none 5.28 + 5.29 + CC= gcc -std=gnu99 5.30 +-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) 5.31 ++CFLAGS= -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) 5.32 + LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) 5.33 + LIBS= -lm $(SYSLIBS) $(MYLIBS) 5.34 + 5.35 +@@ -29,6 +29,7 @@ 5.36 + PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris 5.37 + 5.38 + LUA_A= liblua.a 5.39 ++LUA_SO= liblua.so 5.40 + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ 5.41 + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ 5.42 + ltm.o lundump.o lvm.o lzio.o 5.43 +@@ -43,7 +44,7 @@ 5.44 + LUAC_O= luac.o 5.45 + 5.46 + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) 5.47 +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) 5.48 ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) 5.49 + ALL_A= $(LUA_A) 5.50 + 5.51 + # Targets start here. 5.52 +@@ -59,6 +60,12 @@ 5.53 + $(AR) $@ $(BASE_O) 5.54 + $(RANLIB) $@ 5.55 + 5.56 ++$(LUA_SO): $(CORE_O) $(LIB_O) 5.57 ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) 5.58 ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) 5.59 ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) 5.60 ++ 5.61 ++ 5.62 + $(LUA_T): $(LUA_O) $(LUA_A) 5.63 + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) 5.64 +
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/lua/stuff/patches/series Sat Jul 15 14:17:09 2017 +0300 6.3 @@ -0,0 +1,1 @@ 6.4 +lua-5.3.4-shared_library-1.patch
7.1 --- a/luafilesystem/receipt Sat Jul 15 12:26:33 2017 +0200 7.2 +++ b/luafilesystem/receipt Sat Jul 15 14:17:09 2017 +0300 7.3 @@ -1,27 +1,34 @@ 7.4 -# SliTaz package receipt. 7.5 +# SliTaz package receipt v2. 7.6 7.7 PACKAGE="luafilesystem" 7.8 -VERSION="1.6.2" 7.9 -CATEGORY="development" 7.10 -SHORT_DESC="File System Library for the Lua Programming Language." 7.11 +VERSION="1.6.3" 7.12 +CATEGORY="libdevel" 7.13 +SHORT_DESC="File system library for the Lua programming language" 7.14 MAINTAINER="pascal.bellard@slitaz.org" 7.15 LICENSE="MIT" 7.16 +WEB_SITE="http://keplerproject.github.io/luafilesystem/" 7.17 + 7.18 TARBALL="$PACKAGE-$VERSION.tar.gz" 7.19 -WEB_SITE="http://keplerproject.github.io/luafilesystem/" 7.20 WGET_URL="https://github.com/keplerproject/$PACKAGE/archive/v${VERSION//./_}.tar.gz" 7.21 7.22 -SUGGESTED="lua" 7.23 -BUILD_DEPENDS="wget lua-dev" 7.24 +BUILD_DEPENDS="lua-dev" 7.25 7.26 # Rules to configure and make the package. 7.27 compile_rules() 7.28 { 7.29 - make 7.30 + # Determine Lua version (i.e "5.3") 7.31 + luaver=$(grep 'V=' /usr/lib/pkgconfig/lua.pc | cut -d= -f2) 7.32 + # Fix prefix and install dir 7.33 + sed -i "s|^PREFIX=.*|PREFIX=/usr|; s|5.1|$luaver|" $src/config 7.34 + # Use DESTDIR 7.35 + sed -i "s|\$(LUA_LIBDIR)|\$(DESTDIR)&|" $src/Makefile 7.36 + 7.37 + make && make test && make install 7.38 } 7.39 7.40 # Rules to gen a SliTaz package suitable for Tazpkg. 7.41 genpkg_rules() 7.42 { 7.43 - mkdir -p $fs/usr/lib/lua/5.2/ 7.44 - cp -a $src/src/lfs.so $fs/usr/lib/lua/5.2/ 7.45 + copy @std 7.46 + SUGGESTED="lua" 7.47 }