From b6cd36ec38bb642edfd5b8144fee806882cf9789 Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jeremy@baxters.nz>
Date: Thu, 13 Jun 2024 10:51:20 +1200
Subject: [PATCH] external/lua: don't build liblua.a

---
 external/lua/Makefile                        | 48 +++++---------
 external/lua/patches/lua-5.4.6-makefile.diff | 68 +++++++++++++-------
 2 files changed, 63 insertions(+), 53 deletions(-)

diff --git a/external/lua/Makefile b/external/lua/Makefile
index ac8a4f2..64da0c1 100644
--- a/external/lua/Makefile
+++ b/external/lua/Makefile
@@ -9,8 +9,6 @@ CC=      ${_CC}
 CFLAGS=  ${_CFLAGS} ${_EXT_CPPFLAGS}
 LDFLAGS= ${_LDFLAGS}
 
-AR= ar cr
-RANLIB= ranlib
 RM= rm -f
 
 SYSCFLAGS=
@@ -27,52 +25,40 @@ CMCFLAGS=
 
 # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
 
-LUA_A=	liblua.a
 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)
 
-LUA_T=	lua
-LUA_O=	lua.o
-
-LUAC_T=	luac
-LUAC_O=	luac.o
-
-ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-ALL_A= $(LUA_A)
+ALL_O= $(BASE_O)
 
 # Targets start here.
-all:	$(ALL_T)
+all: $(ALL_O)
 
-o:	$(ALL_O)
-
-a:	$(ALL_A)
-
-$(LUA_A): $(BASE_O)
-	$(AR) $@ $(BASE_O)
-	$(RANLIB) $@
-
-$(LUA_T): $(LUA_O) $(LUA_A)
-	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-
-$(LUAC_T): $(LUAC_O) $(LUA_A)
-	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-
-test:
-	./$(LUA_T) -v
+o: $(ALL_O)
 
 clean:
-	$(RM) $(ALL_T) $(ALL_O)
+	$(RM) $(ALL_O)
 
 depend:
 	@$(CC) $(CFLAGS) -MM l*.c
 
+echo:
+	@echo "PLAT= $(PLAT)"
+	@echo "CC= $(CC)"
+	@echo "CFLAGS= $(CFLAGS)"
+	@echo "LDFLAGS= $(LDFLAGS)"
+	@echo "LIBS= $(LIBS)"
+	@echo "AR= $(AR)"
+	@echo "RANLIB= $(RANLIB)"
+	@echo "RM= $(RM)"
+	@echo "UNAME= $(UNAME)"
+	@echo "BASE_O= $(BASE_O)"
+
 # Convenience targets for popular platforms.
 ALL= all
 
 # Targets that do not create files (not all makes understand .PHONY).
-.PHONY: all test clean o a depend
+.PHONY: all test clean o depend echo
 
 # Compiler modules may use special flags.
 llex.o:
diff --git a/external/lua/patches/lua-5.4.6-makefile.diff b/external/lua/patches/lua-5.4.6-makefile.diff
index 979cad0..45083a6 100644
--- a/external/lua/patches/lua-5.4.6-makefile.diff
+++ b/external/lua/patches/lua-5.4.6-makefile.diff
@@ -1,6 +1,6 @@
 --- Makefile
 +++ Makefile
-@@ -3,18 +3,15 @@
+@@ -3,18 +3,13 @@
  
  # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
  
@@ -17,46 +17,70 @@
 +LDFLAGS= ${_LDFLAGS}
  
 -AR= ar rcu
-+AR= ar cr
- RANLIB= ranlib
+-RANLIB= ranlib
  RM= rm -f
 -UNAME= uname
  
  SYSCFLAGS=
  SYSLDFLAGS=
-@@ -30,8 +27,6 @@
+@@ -30,47 +25,19 @@
  
  # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
  
 -PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris
 -
- LUA_A=	liblua.a
+-LUA_A=	liblua.a
  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
-@@ -48,8 +43,6 @@
- ALL_A= $(LUA_A)
+ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+ 
+-LUA_T=	lua
+-LUA_O=	lua.o
+-
+-LUAC_T=	luac
+-LUAC_O=	luac.o
+-
+-ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+-ALL_A= $(LUA_A)
++ALL_O= $(BASE_O)
  
  # Targets start here.
 -default: $(PLAT)
 -
- all:	$(ALL_T)
+-all:	$(ALL_T)
+-
+-o:	$(ALL_O)
+-
+-a:	$(ALL_A)
++all: $(ALL_O)
+ 
+-$(LUA_A): $(BASE_O)
+-	$(AR) $@ $(BASE_O)
+-	$(RANLIB) $@
+-
+-$(LUA_T): $(LUA_O) $(LUA_A)
+-	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+-
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
+-	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+-
+-test:
+-	./$(LUA_T) -v
++o: $(ALL_O)
+ 
+ clean:
+-	$(RM) $(ALL_T) $(ALL_O)
++	$(RM) $(ALL_O)
  
- o:	$(ALL_O)
-@@ -75,76 +68,11 @@
  depend:
  	@$(CC) $(CFLAGS) -MM l*.c
+@@ -85,66 +52,13 @@
+ 	@echo "RANLIB= $(RANLIB)"
+ 	@echo "RM= $(RM)"
+ 	@echo "UNAME= $(UNAME)"
++	@echo "BASE_O= $(BASE_O)"
  
--echo:
--	@echo "PLAT= $(PLAT)"
--	@echo "CC= $(CC)"
--	@echo "CFLAGS= $(CFLAGS)"
--	@echo "LDFLAGS= $(LDFLAGS)"
--	@echo "LIBS= $(LIBS)"
--	@echo "AR= $(AR)"
--	@echo "RANLIB= $(RANLIB)"
--	@echo "RM= $(RM)"
--	@echo "UNAME= $(UNAME)"
--
  # Convenience targets for popular platforms.
  ALL= all
  
@@ -116,7 +140,7 @@
 -
  # Targets that do not create files (not all makes understand .PHONY).
 -.PHONY: all $(PLATS) help test clean default o a depend echo
-+.PHONY: all test clean o a depend
++.PHONY: all test clean o depend echo
  
  # Compiler modules may use special flags.
  llex.o: