Fri Apr 9 14:18:12 2021 UTC ()
lua54: update to 5.4.3

this is a bugfix release, see
https://www.lua.org/bugs.html


(nia)
diff -r1.4 -r1.5 pkgsrc/lang/lua54/distinfo
diff -r1.3 -r1.4 pkgsrc/lang/lua54/version.mk
diff -r1.2 -r1.3 pkgsrc/lang/lua54/patches/patch-src_Makefile
cvs diff -r1.4 -r1.5 pkgsrc/lang/lua54/distinfo (switch to unified diff)

--- pkgsrc/lang/lua54/distinfo 2020/12/18 19:58:31 1.4
+++ pkgsrc/lang/lua54/distinfo 2021/04/09 14:18:12 1.5
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.4 2020/12/18 19:58:31 nia Exp $ 1$NetBSD: distinfo,v 1.5 2021/04/09 14:18:12 nia Exp $
2 2
3SHA1 (lua-5.4.2.tar.gz) = 96d4a21393c94bed286b8dc0568f4bdde8730b22 3SHA1 (lua-5.4.3.tar.gz) = 1dda2ef23a9828492b4595c0197766de6e784bc7
4RMD160 (lua-5.4.2.tar.gz) = 59e9e4cf9068897b241366551714a5c8fd54242f 4RMD160 (lua-5.4.3.tar.gz) = dbc848ef449e0cc6e299c72708150a20b35fdbaf
5SHA512 (lua-5.4.2.tar.gz) = 9454a6ffd973598f2f4a2399834c31c4d5090bd12e716776e3189aa57760319d114ee64a8338bbc2ef5e08150bf0adc2ad94a1b2677f38538a43359969d4d920 5SHA512 (lua-5.4.3.tar.gz) = 3a1a3ee8694b72b4ec9d3ce76705fe179328294353604ca950c53f41b41161b449877d43318ef4501fee44ecbd6c83314ce7468d7425ba9b2903c9c32a28bbc0
6Size (lua-5.4.2.tar.gz) = 353472 bytes 6Size (lua-5.4.3.tar.gz) = 358216 bytes
7SHA1 (patch-Makefile) = 22523bc60fe8d004f3bfd59396cfc6e43f645a75 7SHA1 (patch-Makefile) = 22523bc60fe8d004f3bfd59396cfc6e43f645a75
8SHA1 (patch-src_Makefile) = ff5e522cc669c87f8cd334e37cea792cad5acfa3 8SHA1 (patch-src_Makefile) = 2fabdb027ae3fcd31c2c65cfe9f9633a583c41d7
cvs diff -r1.3 -r1.4 pkgsrc/lang/lua54/version.mk (switch to unified diff)

--- pkgsrc/lang/lua54/version.mk 2020/12/18 19:58:31 1.3
+++ pkgsrc/lang/lua54/version.mk 2021/04/09 14:18:12 1.4
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1# $NetBSD: version.mk,v 1.3 2020/12/18 19:58:31 nia Exp $ 1# $NetBSD: version.mk,v 1.4 2021/04/09 14:18:12 nia Exp $
2 2
3LUA_VERSION= 5.4.2 3LUA_VERSION= 5.4.3
4 4
5LUA_VERSION_MAJOR= ${LUA_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} 5LUA_VERSION_MAJOR= ${LUA_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
6LUA_VERSION_MINOR= ${LUA_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 6LUA_VERSION_MINOR= ${LUA_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
cvs diff -r1.2 -r1.3 pkgsrc/lang/lua54/patches/patch-src_Makefile (switch to unified diff)

--- pkgsrc/lang/lua54/patches/patch-src_Makefile 2020/12/18 19:58:31 1.2
+++ pkgsrc/lang/lua54/patches/patch-src_Makefile 2021/04/09 14:18:12 1.3
@@ -1,81 +1,81 @@ @@ -1,81 +1,81 @@
1$NetBSD: patch-src_Makefile,v 1.2 2020/12/18 19:58:31 nia Exp $ 1$NetBSD: patch-src_Makefile,v 1.3 2021/04/09 14:18:12 nia Exp $
2 2
3- Don't override CC/CFLAGS/LDFLAGS. 3- Don't override CC/CFLAGS/LDFLAGS.
4- Use libtool to build shared libraries. 4- Use libtool to build shared libraries.
5 5
6--- src/Makefile.orig 2020-11-10 18:39:37.000000000 +0000 6--- src/Makefile.orig 2021-02-09 18:47:17.000000000 +0000
7+++ src/Makefile 7+++ src/Makefile
8@@ -6,9 +6,8 @@ 8@@ -6,9 +6,8 @@
9 # Your platform. See PLATS for possible values. 9 # Your platform. See PLATS for possible values.
10 PLAT= guess 10 PLAT= guess
11  11
12-CC= gcc -std=gnu99 12-CC= gcc -std=gnu99
13-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) 13-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
14-LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) 14-LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
15+CFLAGS+= -std=gnu99 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) 15+CFLAGS+= -std=gnu99 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
16+LDFLAGS+= $(SYSLDFLAGS) $(MYLDFLAGS) 16+LDFLAGS+= $(SYSLDFLAGS) $(MYLDFLAGS)
17 LIBS= -lm $(SYSLIBS) $(MYLIBS) 17 LIBS= -lm $(SYSLIBS) $(MYLIBS)
18  18
19 AR= ar rcu 19 AR= ar rcu
20@@ -32,16 +31,16 @@ CMCFLAGS=  20@@ -32,16 +31,16 @@ CMCFLAGS=
21  21
22 PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris 22 PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
23  23
24-LUA_A= liblua.a 24-LUA_A= liblua.a
25+LUA_A= liblua5.4.la 25+LUA_A= liblua5.4.la
26 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 26 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
27 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 27 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
28-BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) 28-BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
29+BASE_O= $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) $(MYOBJS:.o=.lo) 29+BASE_O= $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) $(MYOBJS:.o=.lo)
30  30
31 LUA_T= lua 31 LUA_T= lua
32-LUA_O= lua.o 32-LUA_O= lua.o
33+LUA_O= lua.lo 33+LUA_O= lua.lo
34  34
35 LUAC_T= luac 35 LUAC_T= luac
36-LUAC_O= luac.o 36-LUAC_O= luac.o
37+LUAC_O= luac.lo 37+LUAC_O= luac.lo
38  38
39 ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) 39 ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
40 ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) 40 ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
41@@ -56,15 +55,19 @@ o: $(ALL_O) 41@@ -56,15 +55,19 @@ o: $(ALL_O)
42  42
43 a: $(ALL_A) 43 a: $(ALL_A)
44  44
45+.SUFFIXES: .lo 45+.SUFFIXES: .lo
46+ 46+
47+.c.lo: 47+.c.lo:
48+ $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) -c $< 48+ $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) -c $<
49+ 49+
50 $(LUA_A): $(BASE_O) 50 $(LUA_A): $(BASE_O)
51- $(AR) $@ $(BASE_O) 51- $(AR) $@ $(BASE_O)
52- $(RANLIB) $@ 52- $(RANLIB) $@
53+ $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(BASE_O) -rpath $(PREFIX)/lib -version-info 5:4 $(LIBS) 53+ $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(BASE_O) -rpath $(PREFIX)/lib -version-info 5:4 $(LIBS)
54  54
55 $(LUA_T): $(LUA_O) $(LUA_A) 55 $(LUA_T): $(LUA_O) $(LUA_A)
56- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) 56- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
57+ $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) 57+ $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
58  58
59 $(LUAC_T): $(LUAC_O) $(LUA_A) 59 $(LUAC_T): $(LUAC_O) $(LUA_A)
60- $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) 60- $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
61+ $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) 61+ $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
62  62
63 test: 63 test:
64 ./lua -v 64 ./$(LUA_T) -v
65@@ -141,16 +144,6 @@ SunOS solaris: 65@@ -143,16 +146,6 @@ SunOS solaris:
66 # Targets that do not create files (not all makes understand .PHONY). 66 # Targets that do not create files (not all makes understand .PHONY).
67 .PHONY: all $(PLATS) help test clean default o a depend echo 67 .PHONY: all $(PLATS) help test clean default o a depend echo
68  68
69-# Compiler modules may use special flags. 69-# Compiler modules may use special flags.
70-llex.o: 70-llex.o:
71- $(CC) $(CFLAGS) $(CMCFLAGS) -c llex.c 71- $(CC) $(CFLAGS) $(CMCFLAGS) -c llex.c
72- 72-
73-lparser.o: 73-lparser.o:
74- $(CC) $(CFLAGS) $(CMCFLAGS) -c lparser.c 74- $(CC) $(CFLAGS) $(CMCFLAGS) -c lparser.c
75- 75-
76-lcode.o: 76-lcode.o:
77- $(CC) $(CFLAGS) $(CMCFLAGS) -c lcode.c 77- $(CC) $(CFLAGS) $(CMCFLAGS) -c lcode.c
78- 78-
79 # DO NOT DELETE 79 # DO NOT DELETE
80  80
81 lapi.o: lapi.c lprefix.h lua.h luaconf.h lapi.h llimits.h lstate.h \ 81 lapi.o: lapi.c lprefix.h lua.h luaconf.h lapi.h llimits.h lstate.h \