head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.24 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.22 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.20 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.18 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.16 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.14 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.12 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.10 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.8 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.6 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.4 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.2 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.4.0.12 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.10 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.8 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.6 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.4 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.2 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.3.0.4 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.2 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.2.0.4 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.2 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.1.0.2 pkgsrc-2020Q3-base:1.1; locks; strict; comment @# @; 1.5 date 2023.05.15.08.17.11; author nikita; state Exp; branches; next 1.4; commitid rI3kUaPWBzScb2pE; 1.4 date 2021.10.27.13.02.40; author nia; state Exp; branches; next 1.3; commitid JO1rJsEmRCwHWreD; 1.3 date 2021.04.09.14.18.12; author nia; state Exp; branches; next 1.2; commitid 5z9UP35331TiPCOC; 1.2 date 2020.12.18.19.58.31; author nia; state Exp; branches; next 1.1; commitid tg6KCEhDLpubjgAC; 1.1 date 2020.06.30.13.16.14; author nia; state Exp; branches; next ; commitid EcRa1LFufez7zfeC; desc @@ 1.5 log @lua54: update to version 5.4.6 Changelog: "Emergency" new version 5.4.6 'lua_resetthread' is back to its original signature, to avoid incompatibilities in the ABI between releases of the same version. New function 'lua_closethread' added with the 'correct' signature. @ text @$NetBSD: patch-src_Makefile,v 1.4 2021/10/27 13:02:40 nia Exp $ - Don't override CC/CFLAGS/LDFLAGS. - Use libtool to build shared libraries. --- src/Makefile.orig 2023-02-03 11:43:14.000000000 +0100 +++ src/Makefile 2023-05-07 14:17:04.851265572 +0200 @@@@ -6,9 +6,8 @@@@ # Your platform. See PLATS for possible values. PLAT= guess -CC= gcc -std=gnu99 -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) -LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) +CFLAGS+= -std=gnu99 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) +LDFLAGS+= $(SYSLDFLAGS) $(MYLDFLAGS) LIBS= -lm $(SYSLIBS) $(MYLIBS) AR= ar rcu @@@@ -32,16 +31,16 @@@@ PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris -LUA_A= liblua.a +LUA_A= liblua5.4.la 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) +BASE_O= $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) $(MYOBJS:.o=.lo) LUA_T= lua -LUA_O= lua.o +LUA_O= lua.lo LUAC_T= luac -LUAC_O= luac.o +LUAC_O= luac.lo ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) @@@@ -56,15 +55,19 @@@@ a: $(ALL_A) +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) -c $< + $(LUA_A): $(BASE_O) - $(AR) $@@ $(BASE_O) - $(RANLIB) $@@ + $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@@ $(LDFLAGS) $(BASE_O) -rpath $(PREFIX)/lib -version-info 5:4 $(LIBS) $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -static -o $@@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) test: ./$(LUA_T) -v @@@@ -146,16 +149,6 @@@@ # Targets that do not create files (not all makes understand .PHONY). .PHONY: all $(PLATS) help test clean default o a depend echo -# Compiler modules may use special flags. -llex.o: - $(CC) $(CFLAGS) $(CMCFLAGS) -c llex.c - -lparser.o: - $(CC) $(CFLAGS) $(CMCFLAGS) -c lparser.c - -lcode.o: - $(CC) $(CFLAGS) $(CMCFLAGS) -c lcode.c - # DO NOT DELETE lapi.o: lapi.c lprefix.h lua.h luaconf.h lapi.h llimits.h lstate.h \ @ 1.4 log @lua54: Include correct objects in luac binary Problem and solution identified by Piotr Meyer in a private email, thanks. @ text @d1 1 a1 1 $NetBSD: patch-src_Makefile,v 1.3 2021/04/09 14:18:12 nia Exp $ d6 2 a7 2 --- src/Makefile.orig 2021-02-09 18:47:17.000000000 +0000 +++ src/Makefile d20 1 a20 1 @@@@ -32,16 +31,16 @@@@ CMCFLAGS= d22 1 a22 1 PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris d41 1 a41 1 @@@@ -56,15 +55,19 @@@@ o: $(ALL_O) d65 1 a65 1 @@@@ -143,16 +146,6 @@@@ SunOS solaris: @ 1.3 log @lua54: update to 5.4.3 this is a bugfix release, see https://www.lua.org/bugs.html @ text @d1 1 a1 1 $NetBSD: patch-src_Makefile,v 1.2 2020/12/18 19:58:31 nia Exp $ d61 1 a61 1 + $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) @ 1.2 log @lua54: Update to 5.4.2. this is a bugfix release, see http://www.lua.org/work/ @ text @d1 1 a1 1 $NetBSD: patch-src_Makefile,v 1.1 2020/06/30 13:16:14 nia Exp $ d6 1 a6 1 --- src/Makefile.orig 2020-11-10 18:39:37.000000000 +0000 d64 2 a65 2 ./lua -v @@@@ -141,16 +144,6 @@@@ SunOS solaris: @ 1.1 log @lang: Add lua54. Note: this is slightly different than other Lua packages and, among other things, implements its own install target. This is becuase I wanted to minimize the amount of patching to Makefiles to make it fit into the pkgsrc world. Lua is a powerful, fast, lightweight, embeddable scripting language. 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. This version is a preferred choice for new Lua modules. @ text @d1 1 a1 1 $NetBSD$ d6 1 a6 1 --- src/Makefile.orig 2020-04-15 13:00:29.000000000 +0000 d20 1 a20 8 @@@@ -25,23 +24,20 @@@@ MYLDFLAGS= MYLIBS= MYOBJS= -# Special flags for compiler modules; -Os reduces code size. -CMCFLAGS= -Os - # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= d41 1 a41 1 @@@@ -56,15 +52,19 @@@@ o: $(ALL_O) d65 1 a65 1 @@@@ -141,16 +141,6 @@@@ SunOS solaris: @