Date: Monday, June 29, 2020 @ 21:37:20 Author: anatolik Revision: 390617
upgpkg: lua 5.4.0-1 Modified: lua/trunk/PKGBUILD lua/trunk/liblua.so.patch -----------------+ PKGBUILD | 21 ++++++++++----------- liblua.so.patch | 34 +++++++++++++++++----------------- 2 files changed, 27 insertions(+), 28 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-29 20:38:31 UTC (rev 390616) +++ PKGBUILD 2020-06-29 21:37:20 UTC (rev 390617) @@ -3,9 +3,9 @@ # Contributor: Damir Perisa <damir.per...@bluewin.ch> pkgname=lua -pkgver=5.3.5 +pkgver=5.4.0 _majorver=${pkgver%.*} -pkgrel=3 +pkgrel=1 pkgdesc='Powerful lightweight programming language designed for extending applications' arch=('x86_64') url='https://www.lua.org/' @@ -16,8 +16,8 @@ liblua.so.patch lua.pc LICENSE) -sha1sums=('112eb10ff04d1b4c9898e121d6bdf54a81482447' - 'cb7b28999970358e03bffcb58578a651bf9b287e' +sha1sums=('8cdbffa8a214a23d190d7c45f38c19518ae62e89' + 'cdfa66057f43aaf4b5914496aa6a4556f3a6e7a0' '1aee8d1a219639d0efc534e483ffa1ee236fb393' '05f5f3b7bef0258bd617c505b8992de639af4551') @@ -28,14 +28,13 @@ sed "s/%VER%/$_majorver/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc # Lua 5.3.4 has wrong release version in its Makefile. Fix it. - sed "s/^R= \$V.4/R= \$V.5/" -i Makefile + # sed "s/^R= \$V.4/R= \$V.5/" -i Makefile } build() { cd lua-$pkgver - # quite a lot of packages still use lua 5.1 API, enable 5.1 compat mode - make MYCFLAGS="$CFLAGS -fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" MYLDFLAGS="$LDFLAGS" linux + make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux } package() { @@ -51,10 +50,10 @@ ln -sf /usr/bin/luac "$pkgdir"/usr/bin/luac$_majorver ln -sf /usr/lib/liblua.so.$pkgver "$pkgdir"/usr/lib/liblua$_majorver.so - install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/${pkgname}53.pc - ln -sf ${pkgname}53.pc "$pkgdir"/usr/lib/pkgconfig/${pkgname}.pc - ln -sf ${pkgname}53.pc "$pkgdir"/usr/lib/pkgconfig/${pkgname}5.3.pc - ln -sf ${pkgname}53.pc "$pkgdir"/usr/lib/pkgconfig/${pkgname}-5.3.pc + install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/lua54.pc + ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua.pc + ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua5.4.pc + ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua-5.4.pc install -d "$pkgdir"/usr/share/doc/$pkgname install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname Modified: liblua.so.patch =================================================================== --- liblua.so.patch 2020-06-29 20:38:31 UTC (rev 390616) +++ liblua.so.patch 2020-06-29 21:37:20 UTC (rev 390617) @@ -1,29 +1,29 @@ diff --git a/Makefile b/Makefile -index 7fa91c8..dccf485 100644 +index 416f444..eeaff03 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ R= $V.0 all: $(PLAT) - $(PLATS) clean: -- cd src && $(MAKE) $@ -+ cd src && $(MAKE) $@ V=$(V) R=$(R) + $(PLATS) help test clean: +- @cd src && $(MAKE) $@ ++ @cd src && $(MAKE) $@ V=$(V) R=$(R) - test: dummy - src/lua -v + install: dummy + cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) diff --git a/src/Makefile b/src/Makefile -index 2e7a412..fa5769f 100644 +index 514593d..372a6dc 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -29,6 +29,7 @@ MYOBJS= - PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris +@@ -33,6 +33,7 @@ CMCFLAGS= -Os + PLATS= guess aix bsd c89 freebsd generic linux linux-readline 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 + 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 + LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o + BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) +@@ -44,7 +45,7 @@ LUAC_T= luac LUAC_O= luac.o ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) @@ -32,7 +32,7 @@ ALL_A= $(LUA_A) # Targets start here. -@@ -59,6 +60,12 @@ $(LUA_A): $(BASE_O) +@@ -60,6 +61,12 @@ $(LUA_A): $(BASE_O) $(AR) $@ $(BASE_O) $(RANLIB) $@ @@ -46,10 +46,10 @@ $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) diff --git a/src/luaconf.h b/src/luaconf.h -index fd28d21..e2662cc 100644 +index bdf927e..7e15198 100644 --- a/src/luaconf.h +++ b/src/luaconf.h -@@ -175,7 +175,7 @@ +@@ -227,7 +227,7 @@ #else /* }{ */ @@ -57,4 +57,4 @@ +#define LUA_ROOT "/usr/" #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" - #define LUA_PATH_DEFAULT \ +