[crux-commits] ports/opt (3.6): [notify] lua: 5.3.5 -> 5.4.0 ABI change check with revdep

crux at crux.nu crux at crux.nu
Thu Jul 16 15:22:04 UTC 2020


commit 57aa613a4ba43158e1a2ee1a3cb057b7adcdf54b
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Mon Jul 13 22:55:07 2020 +1000

    [notify] lua: 5.3.5 -> 5.4.0 ABI change check with revdep

diff --git a/lua/.footprint b/lua/.footprint
index 55a342923..c91e19cbf 100644
--- a/lua/.footprint
+++ b/lua/.footprint
@@ -1,9 +1,9 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/lua
-lrwxrwxrwx	root/root	usr/bin/lua5.3 -> lua
+lrwxrwxrwx	root/root	usr/bin/lua5.4 -> lua
 -rwxr-xr-x	root/root	usr/bin/luac
-lrwxrwxrwx	root/root	usr/bin/luac5.3 -> luac
+lrwxrwxrwx	root/root	usr/bin/luac5.4 -> luac
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/lauxlib.h
 -rw-r--r--	root/root	usr/include/lua.h
@@ -12,18 +12,20 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/lualib.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/liblua.a
-lrwxrwxrwx	root/root	usr/lib/liblua.so -> liblua.so.5.3.5
-lrwxrwxrwx	root/root	usr/lib/liblua.so.5.3 -> liblua.so.5.3.5
--rwxr-xr-x	root/root	usr/lib/liblua.so.5.3.5
-lrwxrwxrwx	root/root	usr/lib/liblua5.3.so -> liblua.so.5.3.5
+lrwxrwxrwx	root/root	usr/lib/liblua.so -> liblua.so.5.4.0
+lrwxrwxrwx	root/root	usr/lib/liblua.so.5.4 -> liblua.so.5.4.0
+-rwxr-xr-x	root/root	usr/lib/liblua.so.5.4.0
+lrwxrwxrwx	root/root	usr/lib/liblua5.4.so -> liblua.so.5.4.0
 drwxr-xr-x	root/root	usr/lib/lua/
-drwxr-xr-x	root/root	usr/lib/lua/5.3/
+drwxr-xr-x	root/root	usr/lib/lua/5.4/
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
-lrwxrwxrwx	root/root	usr/lib/pkgconfig/lua.pc -> lua53.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/lua53.pc
+lrwxrwxrwx	root/root	usr/lib/pkgconfig/lua-5.4.pc -> lua54.pc
+lrwxrwxrwx	root/root	usr/lib/pkgconfig/lua.pc -> lua54.pc
+lrwxrwxrwx	root/root	usr/lib/pkgconfig/lua5.4.pc -> lua54.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/lua54.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/lua/
-drwxr-xr-x	root/root	usr/share/lua/5.3/
+drwxr-xr-x	root/root	usr/share/lua/5.4/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/lua.1.gz
diff --git a/lua/.signature b/lua/.signature
index 1644f98fb..de07f9fe4 100644
--- a/lua/.signature
+++ b/lua/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/S26+vgxOCK9ZgoGGoojsudB7JnvlMwyjF2g4ml+USwQJHY/+eICEFtgq6GwbQSf7xBN4KLRpSD6Jm3qyAhMtgI=
-SHA256 (Pkgfile) = 399a0145152d464921847f176b2ad6b3f35ece5305e06af66ea4fc07836fd05a
-SHA256 (.footprint) = 1aa9e836175fd8ea00b1712c341ea431cd58a6368804f7bb42a11271b75d0df8
-SHA256 (lua-5.3.5.tar.gz) = 0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
-SHA256 (liblua.so.patch) = 2cc83c77423a2dda3696766b2d1ccee2796e052ab04d5178905f41ed9241a3d8
+RWSE3ohX2g5d/dZATvakSsOWut2wi0Ksm34Cm2v7eaDDpmv0TKT2DiTg3st73KniOuSiUZ5gNfTGLULm3oQ9M/s5S971He/7dQA=
+SHA256 (Pkgfile) = 63506478c0c2dd792fcab21e5b4b1700a6649395981ca56244b9b30f3dfa1926
+SHA256 (.footprint) = 5ee44a2c5f55f1443c46da838a2077ccc6f9524d0dae456001b9b9fcb3705d75
+SHA256 (lua-5.4.0.tar.gz) = eac0836eb7219e421a96b7ee3692b93f0629e4cdb0c788432e3d10ce9ed47e28
+SHA256 (liblua.so.patch) = a8a7f89ab0c03b4bc1d58a935c54df792ad628edb4d1788c5ac66e4fc2d9f800
 SHA256 (lua.pc) = ca9252633e782b8f85d6a94ea4f6babd4fe30bd759085b373160b1878e36ff78
diff --git a/lua/Pkgfile b/lua/Pkgfile
index 96fe683a5..0d519c31b 100644
--- a/lua/Pkgfile
+++ b/lua/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: readline
 
 name=lua
-version=5.3.5
+version=5.4.0
 release=1
 source=(https://www.lua.org/ftp/$name-$version.tar.gz
 	liblua.so.patch lua.pc)
@@ -16,10 +16,7 @@ build() {
 
 	sed "s/%VER%/${version:0:3}/g;s/%REL%/$version/g" $SRC/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
-
-	make MYCFLAGS="$CFLAGS -fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" MYLDFLAGS="$LDFLAGS" linux
+	make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux
 
 	make \
 		TO_LIB="liblua.a liblua.so liblua.so.${version:0:3} liblua.so.$version" \
@@ -28,13 +25,12 @@ build() {
 		INSTALL_MAN=$PKG/usr/share/man/man1 \
 		install
 
-	# odd behaviour
-	chmod -v u+w $PKG/usr/share/man/man1/lua.1
-
 	ln -s lua $PKG/usr/bin/lua${version:0:3}
 	ln -s luac $PKG/usr/bin/luac${version:0:3}
 	ln -s liblua.so.$version $PKG/usr/lib/liblua${version:0:3}.so
 
-	install -m 0644 -D lua.pc $PKG/usr/lib/pkgconfig/lua53.pc
-	ln -s lua53.pc $PKG/usr/lib/pkgconfig/lua.pc
+	install -m 0644 -D lua.pc $PKG/usr/lib/pkgconfig/lua${version:0:1}${version:2:1}.pc
+	ln -s lua${version:0:1}${version:2:1}.pc $PKG/usr/lib/pkgconfig/lua.pc
+	ln -s lua${version:0:1}${version:2:1}.pc $PKG/usr/lib/pkgconfig/lua${version:0:3}.pc
+	ln -s lua${version:0:1}${version:2:1}.pc $PKG/usr/lib/pkgconfig/lua-${version:0:3}.pc
 }
diff --git a/lua/liblua.so.patch b/lua/liblua.so.patch
index f9e24f328..197832116 100644
--- a/lua/liblua.so.patch
+++ b/lua/liblua.so.patch
@@ -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 @@ index 2e7a412..fa5769f 100644
  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 @@ index 2e7a412..fa5769f 100644
  	$(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 @@ index fd28d21..e2662cc 100644
 +#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  \
+ 


More information about the crux-commits mailing list