head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.2 pkgsrc-2026Q1-base:1.1; locks; strict; comment @# @; 1.1 date 2026.01.08.22.54.54; author alnsn; state Exp; branches; next ; commitid k6MyyefNE2QWUDpG; desc @@ 1.1 log @Add missing patch. @ text @$NetBSD$ PR#221: Support Lua 5.5 https://github.com/wahern/luaossl/pull/221 --- src/GNUmakefile.orig 2022-07-11 05:40:14.000000000 +0000 +++ src/GNUmakefile @@@@ -41,6 +41,7 @@@@ $$(d)/$(1)/%.o: $$(d)/%.c $$(d)/config.h ifneq ($(1), 5.3) ifneq ($(1), 5.4) +ifneq ($(1), 5.5) $$(d)/$(1)/compat53.o: $$(d)/../vendor/compat53/c-api/compat-5.3.c $$(d)/../vendor/compat53/c-api/compat-5.3.h $$(d)/config.h $$(MKDIR) -p $$(@@D) $$(CC) $$(CFLAGS_$(d)) $$(ALL_LUA$(subst .,,$(1))_CPPFLAGS) $$(CPPFLAGS_$(d)) -c -o $$@@ $$< @@@@ -50,6 +51,7 @@@@ $$(d)/$(1)/%.o: $$(d)/../vendor/compat53 $$(d)/$(1)/openssl.so: $$(d)/$(1)/compat53.o endif endif +endif .SECONDARY: liblua$(1)-openssl openssl$(1) openssl @@@@ -61,14 +63,16 @@@@ $(eval $(call BUILD_$(d),5.1)) $(eval $(call BUILD_$(d),5.2)) $(eval $(call BUILD_$(d),5.3)) $(eval $(call BUILD_$(d),5.4)) +$(eval $(call BUILD_$(d),5.5)) ifneq "$(filter $(abspath $(d)/..)/%, $(abspath $(firstword $(MAKEFILE_LIST))))" "" -.SECONDARY: all all5.1 all5.2 all5.3 all5.4 +.SECONDARY: all all5.1 all5.2 all5.3 all5.4 all5.5 all5.1: liblua5.1-openssl all5.2: liblua5.2-openssl all5.3: liblua5.3-openssl all5.4: liblua5.4-openssl +all5.5: liblua5.5-openssl all: $(foreach API,$(strip $(LUA_APIS)),all$(API)) endif @@@@ -157,23 +161,26 @@@@ $(eval $(call INSTALL_$(d),5.1,$$(lua51c $(eval $(call INSTALL_$(d),5.2,$$(lua52cpath),$$(lua52path))) $(eval $(call INSTALL_$(d),5.3,$$(lua53cpath),$$(lua53path))) $(eval $(call INSTALL_$(d),5.4,$$(lua54cpath),$$(lua54path))) +$(eval $(call INSTALL_$(d),5.5,$$(lua55cpath),$$(lua55path))) ifneq "$(filter $(abspath $(d)/..)/%, $(abspath $(firstword $(MAKEFILE_LIST))))" "" -.SECONDARY: install5.1 install5.2 install5.3 install5.4 install +.SECONDARY: install5.1 install5.2 install5.3 install5.4 install5.5 install install5.1: liblua5.1-openssl-install install5.2: liblua5.2-openssl-install install5.3: liblua5.3-openssl-install install5.4: liblua5.4-openssl-install +install5.5: liblua5.5-openssl-install install: $(foreach API,$(strip $(LUA_APIS)),install$(API)) -.PHONY: uninstall5.1 uninstall5.2 uninstall5.3 uninstall5.4 uninstall +.PHONY: uninstall5.1 uninstall5.2 uninstall5.3 uninstall5.4 uninstall5.5 uninstall uninstall5.1: liblua5.1-openssl-uninstall uninstall5.2: liblua5.2-openssl-uninstall uninstall5.3: liblua5.3-openssl-uninstall uninstall5.4: liblua5.4-openssl-uninstall +uninstall5.5: liblua5.5-openssl-uninstall uninstall: $(foreach API,$(strip $(LUA_APIS)),uninstall$(API)) endif @@@@ -185,7 +192,7 @@@@ endif .PHONY: $(d)/clean $(d)/clean~ clean clean~ $(d)/clean: - $(RM) -fr $(@@D)/config.h $(@@D)/*.dSYM $(@@D)/5.1 $(@@D)/5.2 $(@@D)/5.3 $(@@D)/5.4 + $(RM) -fr $(@@D)/config.h $(@@D)/*.dSYM $(@@D)/5.1 $(@@D)/5.2 $(@@D)/5.3 $(@@D)/5.4 $(@@D)/5.5 $(d)/clean~: $(d)/clean $(RM) -f $(@@D)/*~ @@@@ -209,16 +216,19 @@@@ $(d)/help: @@echo " all5.2 - build 5.2/openssl.so" @@echo " all5.3 - build 5.3/openssl.so" @@echo " all5.4 - build 5.4/openssl.so" + @@echo " all5.5 - build 5.5/openssl.so" @@echo " install - install all API targets" @@echo " install5.1 - install openssl Lua 5.1 modules" @@echo " install5.2 - install openssl Lua 5.2 modules" @@echo " install5.3 - install openssl Lua 5.3 modules" @@echo " install5.4 - install openssl Lua 5.4 modules" + @@echo " install5.5 - install openssl Lua 5.5 modules" @@echo " uninstall - uninstall all API targets" @@echo "uninstall5.1 - uninstall openssl Lua 5.1 modules" @@echo "uninstall5.2 - uninstall openssl Lua 5.2 modules" @@echo "uninstall5.3 - uninstall openssl Lua 5.3 modules" @@echo "uninstall5.4 - uninstall openssl Lua 5.4 modules" + @@echo "uninstall5.5 - uninstall openssl Lua 5.5 modules" @@echo " clean - rm binary targets, object files, debugging symbols, etc" @@echo " clean~ - clean + rm *~" @@echo " help - echo this help message" @@@@ -235,11 +245,14 @@@@ $(d)/help: @@echo 'lua53cpath - install path for Lua 5.3 C modules ($(value lua53cpath))' @@echo ' lua54path - install path for Lua 5.4 modules ($(value lua54path))' @@echo 'lua54cpath - install path for Lua 5.4 C modules ($(value lua54cpath))' + @@echo ' lua55path - install path for Lua 5.5 modules ($(value lua54path))' + @@echo 'lua55cpath - install path for Lua 5.5 C modules ($(value lua54cpath))' @@echo "" @@echo 'LUA51_CPPFLAGS - cpp flags for Lua 5.1 headers ($(LUA51_CPPFLAGS))' @@echo 'LUA52_CPPFLAGS - cpp flags for Lua 5.2 headers ($(LUA52_CPPFLAGS))' @@echo 'LUA53_CPPFLAGS - cpp flags for Lua 5.3 headers ($(LUA53_CPPFLAGS))' @@echo 'LUA54_CPPFLAGS - cpp flags for Lua 5.4 headers ($(LUA54_CPPFLAGS))' + @@echo 'LUA55_CPPFLAGS - cpp flags for Lua 5.5 headers ($(LUA54_CPPFLAGS))' @@echo "" @@echo "(NOTE: all the common GNU-style paths are supported, including" @@echo "prefix, bindir, libdir, datadir, includedir, and DESTDIR.)" @