From aa905f7abcca50036fea04bd6d9e4e038c714818 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 28 Sep 2019 14:02:27 +0200 Subject: [PATCH] lua 5.3: bump version. --- dev-lang/lua/lua-5.3.3.recipe | 96 --------------- .../{lua-5.3.4.recipe => lua-5.3.5.recipe} | 4 +- dev-lang/lua/patches/lua-5.3.3.gcc2.patchset | 24 ---- dev-lang/lua/patches/lua-5.3.3.patchset | 113 ------------------ ....gcc2.patchset => lua-5.3.5.gcc2.patchset} | 0 ...{lua-5.3.4.patchset => lua-5.3.5.patchset} | 0 6 files changed, 2 insertions(+), 235 deletions(-) delete mode 100644 dev-lang/lua/lua-5.3.3.recipe rename dev-lang/lua/{lua-5.3.4.recipe => lua-5.3.5.recipe} (96%) delete mode 100644 dev-lang/lua/patches/lua-5.3.3.gcc2.patchset delete mode 100644 dev-lang/lua/patches/lua-5.3.3.patchset rename dev-lang/lua/patches/{lua-5.3.4.gcc2.patchset => lua-5.3.5.gcc2.patchset} (100%) rename dev-lang/lua/patches/{lua-5.3.4.patchset => lua-5.3.5.patchset} (100%) diff --git a/dev-lang/lua/lua-5.3.3.recipe b/dev-lang/lua/lua-5.3.3.recipe deleted file mode 100644 index 127a8f608..000000000 --- a/dev-lang/lua/lua-5.3.3.recipe +++ /dev/null @@ -1,96 +0,0 @@ -SUMMARY="A powerful, fast, light-weight, embeddable scripting language" -DESCRIPTION="Lua combines simple procedural syntax with powerful data \ -description constructs based on associative arrays and extensible semantics. \ -Lua is dynamically typed, runs by interpreting bytecode for a register-based \ -virtual machine, and has automatic memory management with incremental garbage \ -collection, making it ideal for configuration, scripting, and rapid prototyping." -HOMEPAGE="https://www.lua.org/" -COPYRIGHT="1994-2016 Roberto Ierusalimschy, Waldemar Celes, Luiz Henrique de \ -Figueiredo" -LICENSE="MIT" -REVISION="2" -SOURCE_URI="https://www.lua.org/ftp/lua-$portVersion.tar.gz" -CHECKSUM_SHA256="5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2" -PATCHES="lua-$portVersion.patchset" -if [ $effectiveTargetArchitecture = x86_gcc2 ]; then - PATCHES+=" - lua-$portVersion.gcc2.patchset - " -fi - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - lua$secondaryArchSuffix = $portVersion compat >= 5.3 - cmd:lua$secondaryArchSuffix = $portVersion compat >= 5.3 - cmd:lua5.3$secondaryArchSuffix = $portVersion compat >= 5.3 - cmd:luac$secondaryArchSuffix = $portVersion compat >= 5.3 - cmd:luac5.3$secondaryArchSuffix = $portVersion compat >= 5.3 - lib:liblua$secondaryArchSuffix = $portVersion compat >= 5.3 - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - lua${secondaryArchSuffix}_devel = $portVersion compat >= 5.3 - devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.3 - " -REQUIRES_devel=" - lua$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " -BUILD_PREREQUIRES=" - cmd:make - cmd:gcc$secondaryArchSuffix - " - -BUILD() -{ - make haiku MYCFLAGS="-DLUA_USE_POSIX -DLUA_COMPAT_5_1 -DLUA_ROOT='\"$prefix/\"' -DLUA_LDIR='\"$dataDir/lua/5.3/\"'" \ - LUA_T="lua5.3" LUAC_T="luac5.3" LUA_SO="liblua.so.5.3" -} - -INSTALL() -{ - make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir/man1" \ - INSTALL_INC="$includeDir/lua53" INSTALL_LMOD="$dataDir/lua/5.3" \ - INSTALL_LIB="$libDir" INSTALL_BIN="$binDir" TO_BIN="lua5.3 luac5.3" \ - TO_LIB="liblua.a liblua.so.5.3" - - ln -s lua5.3 $binDir/lua - ln -s luac5.3 $binDir/luac - ln -s liblua.so.5.3 $libDir/liblua.so - - rm -r $dataDir #empty directory - - mkdir -p $developLibDir/pkgconfig - cat > $developLibDir/pkgconfig/lua.pc << EOF -V=5.3 -R=5.3.3 - -INSTALL_BIN=$binDir -INSTALL_INC=$includeDir -INSTALL_LIB=$libDir -INSTALL_MAN=$manDir -INSTALL_LMOD=${dataDir}/lua/\${V} -INSTALL_CMOD=${libDir}/lua/\${V} -exec_prefix=$prefix -libdir=$libDir -includedir=$includeDir - -Name: Lua -Description: An Extensible Extension Language -Version: \${R} -Requires: -Libs: -L\${libdir} -llua -Cflags: -I\${includedir}/lua53 -EOF - - prepareInstalledDevelLib liblua - packageEntries devel $developDir -} diff --git a/dev-lang/lua/lua-5.3.4.recipe b/dev-lang/lua/lua-5.3.5.recipe similarity index 96% rename from dev-lang/lua/lua-5.3.4.recipe rename to dev-lang/lua/lua-5.3.5.recipe index ccbe35519..4951794aa 100644 --- a/dev-lang/lua/lua-5.3.4.recipe +++ b/dev-lang/lua/lua-5.3.5.recipe @@ -8,9 +8,9 @@ HOMEPAGE="https://www.lua.org/" COPYRIGHT="1994-2016 Roberto Ierusalimschy, Waldemar Celes, Luiz Henrique de \ Figueiredo" LICENSE="MIT" -REVISION="3" +REVISION="1" SOURCE_URI="https://www.lua.org/ftp/lua-$portVersion.tar.gz" -CHECKSUM_SHA256="f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c" +CHECKSUM_SHA256="0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac" PATCHES="lua-$portVersion.patchset" if [ $effectiveTargetArchitecture = x86_gcc2 ]; then PATCHES+=" diff --git a/dev-lang/lua/patches/lua-5.3.3.gcc2.patchset b/dev-lang/lua/patches/lua-5.3.3.gcc2.patchset deleted file mode 100644 index 204e8ee18..000000000 --- a/dev-lang/lua/patches/lua-5.3.3.gcc2.patchset +++ /dev/null @@ -1,24 +0,0 @@ -From 3baf23b0432d26f7e68dbeae519e7567d3a05f84 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Sat, 24 Dec 2016 16:15:39 +0100 -Subject: gcc2 patch - - -diff --git a/src/Makefile b/src/Makefile -index d71c75c..e33a907 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -6,8 +6,8 @@ - # Your platform. See PLATS for possible values. - PLAT= none - --CC= gcc -std=gnu99 --CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) -+CC= gcc -+CFLAGS= -O2 -Wall -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) - LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) - LIBS= -lm $(SYSLIBS) $(MYLIBS) - --- -2.7.0 - diff --git a/dev-lang/lua/patches/lua-5.3.3.patchset b/dev-lang/lua/patches/lua-5.3.3.patchset deleted file mode 100644 index 2b7954be2..000000000 --- a/dev-lang/lua/patches/lua-5.3.3.patchset +++ /dev/null @@ -1,113 +0,0 @@ -From b1db2db24aca8b1f8a59949f78cc2cbe0d01bfb8 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Sat, 24 Dec 2016 15:45:36 +0100 -Subject: import patches from 5.2.1 - - -diff --git a/Makefile b/Makefile -index c795dd7..98d7529 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,12 +36,12 @@ RM= rm -f - # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= - - # Convenience platforms targets. --PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris -+PLATS= aix bsd c89 freebsd generic haiku linux macosx mingw posix solaris - - # What to install. - TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp --TO_LIB= liblua.a -+TO_LIB= liblua.a liblua.so - TO_MAN= lua.1 luac.1 - - # Lua version and release. -@@ -52,7 +52,7 @@ R= $V.3 - all: $(PLAT) - - $(PLATS) clean: -- cd src && $(MAKE) $@ -+ cd src && $(MAKE) V=$(V) $@ - - test: dummy - src/lua -v -diff --git a/src/Makefile b/src/Makefile -index d71c75c..d9b39fb 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -26,9 +26,10 @@ MYOBJS= - - # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= - --PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris -+PLATS= aix bsd c89 freebsd generic haiku 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_T= luac - 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. -@@ -65,6 +66,9 @@ $(LUA_T): $(LUA_O) $(LUA_A) - $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$(V) $(LDFLAGS) $? $(LIBS) -+ - clean: - $(RM) $(ALL_T) $(ALL_O) - -@@ -106,6 +110,9 @@ freebsd: - - generic: $(ALL) - -+haiku: -+ $(MAKE) all SYSCFLAGS="-DLUA_USE_HAIKU" LIBS= -+ - linux: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" - -diff --git a/src/luaconf.h b/src/luaconf.h -index fd447cc..367f1e7 100644 ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -81,7 +81,12 @@ - #define LUA_C89_NUMBERS - #endif - -- -+#if defined(LUA_USE_HAIKU) -+#define LUA_USE_MKSTEMP -+#define LUA_USE_ISATTY -+#define LUA_USE_POPEN -+#define LUA_USE_DLOPEN -+#endif - - /* - @@ LUAI_BITSINT defines the (minimum) number of bits in an 'int'. -@@ -188,8 +193,12 @@ - - #else /* }{ */ - -+#ifndef LUA_ROOT - #define LUA_ROOT "/usr/local/" -+#endif -+#ifndef LUA_LIBDIR - #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" -+#endif - #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" - #define LUA_PATH_DEFAULT \ - LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ --- -2.7.0 - diff --git a/dev-lang/lua/patches/lua-5.3.4.gcc2.patchset b/dev-lang/lua/patches/lua-5.3.5.gcc2.patchset similarity index 100% rename from dev-lang/lua/patches/lua-5.3.4.gcc2.patchset rename to dev-lang/lua/patches/lua-5.3.5.gcc2.patchset diff --git a/dev-lang/lua/patches/lua-5.3.4.patchset b/dev-lang/lua/patches/lua-5.3.5.patchset similarity index 100% rename from dev-lang/lua/patches/lua-5.3.4.patchset rename to dev-lang/lua/patches/lua-5.3.5.patchset