jeremy/callisto
1
Fork 0
Code Releases Activity

external/lua: don't build liblua.a

Browse source
This commit is contained in:
Jeremy Baxter 2024-06-13 10:51:20 +12:00
parent 90af5483fa
commit b6cd36ec38
2 changed files with 63 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

46
external/lua/Makefile vendored
View file

@ -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
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:

68
external/lua/patches/lua-5.4.6-makefile.diff vendored
View file

@ -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: