SFG545
49bf7bbb5d
- Introduced `r.toml` for R package configuration, including build flags and dependencies. - Added `sdl2-compat.toml` for SDL2 compatibility layer with SDL3, specifying build and runtime dependencies. - Created a patch for SDL3 to handle cases when XInput2 is not available, ensuring compatibility. - Added `sdl3.toml` for SDL3 configuration, including build flags and dependencies. - Introduced `tk.toml` for Tk configuration, detailing build flags and runtime dependencies. - Added a patch for Vala to ensure POSIX compliance in the test runner script, improving portability.
187 lines
5.2 KiB
Diff
187 lines
5.2 KiB
Diff
diff -urN a/Makefile b/Makefile
|
|
--- a/Makefile 2025-06-26 08:04:37.000000000 -0500
|
|
+++ b/Makefile 2026-03-23 21:17:07.502287273 -0500
|
|
@@ -18,9 +18,9 @@
|
|
INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
|
|
INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
|
|
|
|
-# How to install. If your install program does not support "-p", then
|
|
+# How to install. If your install program does not preserve timestamps, then
|
|
# you may have to run ranlib on the installed liblua.a.
|
|
-INSTALL= install -p
|
|
+INSTALL?= install
|
|
INSTALL_EXEC= $(INSTALL) -m 0755
|
|
INSTALL_DATA= $(INSTALL) -m 0644
|
|
#
|
|
@@ -30,8 +30,8 @@
|
|
# INSTALL_DATA= $(INSTALL)
|
|
|
|
# Other utilities.
|
|
-MKDIR= mkdir -p
|
|
-RM= rm -f
|
|
+MKDIR?= mkdir -p
|
|
+RM?= rm -f
|
|
|
|
# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
|
|
|
|
@@ -52,7 +52,7 @@
|
|
all: $(PLAT)
|
|
|
|
$(PLATS) help test clean:
|
|
- @cd src && $(MAKE) $@
|
|
+ @cd src && $(MAKE) $@ V=$(V) R=$(R)
|
|
|
|
install: dummy
|
|
cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
|
|
diff -urN a/src/Makefile b/src/Makefile
|
|
--- a/src/Makefile 2025-07-06 19:19:14.000000000 -0500
|
|
+++ b/src/Makefile 2026-03-23 21:17:07.502287273 -0500
|
|
@@ -6,15 +6,21 @@
|
|
# Your platform. See PLATS for possible values.
|
|
PLAT= guess
|
|
|
|
-CC= gcc -std=gnu99
|
|
-CFLAGS= -O2 -Wall -Wextra $(SYSCFLAGS) $(MYCFLAGS)
|
|
-LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
|
|
-LIBS= -lm $(SYSLIBS) $(MYLIBS)
|
|
-
|
|
-AR= ar rcu
|
|
-RANLIB= ranlib
|
|
-RM= rm -f
|
|
-UNAME= uname
|
|
+CC?= cc
|
|
+CXX?= c++
|
|
+CCSTD?= -std=gnu99
|
|
+CFLAGS?= $(CCSTD) -O2 -Wall -Wextra
|
|
+ALLCFLAGS= $(CFLAGS) $(SYSCFLAGS) $(MYCFLAGS)
|
|
+LDFLAGS?=
|
|
+ALLLDFLAGS= $(LDFLAGS) $(SYSLDFLAGS) $(MYLDFLAGS)
|
|
+LIBS?= -lm
|
|
+ALLLIBS= $(LIBS) $(SYSLIBS) $(MYLIBS)
|
|
+
|
|
+AR?= ar
|
|
+ARFLAGS?= rcu
|
|
+RANLIB?= ranlib
|
|
+RM?= rm -f
|
|
+UNAME?= uname
|
|
|
|
SYSCFLAGS=
|
|
SYSLDFLAGS=
|
|
@@ -28,11 +34,20 @@
|
|
# Special flags for compiler modules; -Os reduces code size.
|
|
CMCFLAGS=
|
|
|
|
+# Use C mode when a C++ driver is selected for compiling Lua's C sources.
|
|
+CCMODE=
|
|
+CCLINK= $(CC)
|
|
+ifneq ($(filter %++ c++,$(notdir $(firstword $(CC)))),)
|
|
+CCMODE= -x c
|
|
+endif
|
|
+CCCOMPILE= $(CC) $(CCMODE)
|
|
+
|
|
# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
|
|
|
|
PLATS= guess aix bsd c89 freebsd generic ios linux macosx mingw posix solaris
|
|
|
|
LUA_A= liblua.a
|
|
+LUA_SO= liblua.so
|
|
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)
|
|
@@ -44,7 +59,7 @@
|
|
LUAC_O= luac.o
|
|
|
|
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
|
|
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
|
|
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
|
|
ALL_A= $(LUA_A)
|
|
|
|
# Targets start here.
|
|
@@ -57,14 +72,19 @@
|
|
a: $(ALL_A)
|
|
|
|
$(LUA_A): $(BASE_O)
|
|
- $(AR) $@ $(BASE_O)
|
|
+ $(AR) $(ARFLAGS) $@ $(BASE_O)
|
|
$(RANLIB) $@
|
|
|
|
+$(LUA_SO): $(CORE_O) $(LIB_O)
|
|
+ $(CCLINK) -shared $(ALLLDFLAGS) -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? $(ALLLIBS)
|
|
+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
|
|
+ ln -sf $(LUA_SO).$(R) $(LUA_SO)
|
|
+
|
|
$(LUA_T): $(LUA_O) $(LUA_A)
|
|
- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
|
+ $(CCLINK) -o $@ $(ALLLDFLAGS) $(LUA_O) $(LUA_A) $(ALLLIBS)
|
|
|
|
$(LUAC_T): $(LUAC_O) $(LUA_A)
|
|
- $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
|
|
+ $(CCLINK) -o $@ $(ALLLDFLAGS) $(LUAC_O) $(LUA_A) $(ALLLIBS)
|
|
|
|
test:
|
|
./$(LUA_T) -v
|
|
@@ -73,15 +93,22 @@
|
|
$(RM) $(ALL_T) $(ALL_O)
|
|
|
|
depend:
|
|
- @$(CC) $(CFLAGS) -MM l*.c
|
|
+ @$(CCCOMPILE) $(ALLCFLAGS) -MM l*.c
|
|
|
|
echo:
|
|
@echo "PLAT= $(PLAT)"
|
|
@echo "CC= $(CC)"
|
|
+ @echo "CXX= $(CXX)"
|
|
+ @echo "CCSTD= $(CCSTD)"
|
|
+ @echo "CCMODE= $(CCMODE)"
|
|
@echo "CFLAGS= $(CFLAGS)"
|
|
+ @echo "ALLCFLAGS= $(ALLCFLAGS)"
|
|
@echo "LDFLAGS= $(LDFLAGS)"
|
|
+ @echo "ALLLDFLAGS= $(ALLLDFLAGS)"
|
|
@echo "LIBS= $(LIBS)"
|
|
+ @echo "ALLLIBS= $(ALLLIBS)"
|
|
@echo "AR= $(AR)"
|
|
+ @echo "ARFLAGS= $(ARFLAGS)"
|
|
@echo "RANLIB= $(RANLIB)"
|
|
@echo "RM= $(RM)"
|
|
@echo "UNAME= $(UNAME)"
|
|
@@ -105,7 +132,7 @@
|
|
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-Wl,-E"
|
|
|
|
c89:
|
|
- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_C89" CC="gcc -std=c89"
|
|
+ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_C89" CCSTD="-std=c89"
|
|
@echo ''
|
|
@echo '*** C89 does not guarantee 64-bit integers for Lua.'
|
|
@echo '*** Make sure to compile all external Lua libraries'
|
|
@@ -113,7 +140,7 @@
|
|
@echo ''
|
|
|
|
FreeBSD NetBSD OpenBSD freebsd:
|
|
- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_READLINE -I/usr/include/edit" SYSLIBS="-Wl,-E -ledit" CC="cc"
|
|
+ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_READLINE -I/usr/include/edit" SYSLIBS="-Wl,-E -ledit"
|
|
|
|
generic: $(ALL)
|
|
|
|
@@ -141,15 +168,18 @@
|
|
# Targets that do not create files (not all makes understand .PHONY).
|
|
.PHONY: all $(PLATS) help test clean default o a depend echo
|
|
|
|
+%.o: %.c
|
|
+ $(CCCOMPILE) $(ALLCFLAGS) -c -o $@ $<
|
|
+
|
|
# Compiler modules may use special flags.
|
|
llex.o:
|
|
- $(CC) $(CFLAGS) $(CMCFLAGS) -c llex.c
|
|
+ $(CCCOMPILE) $(ALLCFLAGS) $(CMCFLAGS) -c -o $@ llex.c
|
|
|
|
lparser.o:
|
|
- $(CC) $(CFLAGS) $(CMCFLAGS) -c lparser.c
|
|
+ $(CCCOMPILE) $(ALLCFLAGS) $(CMCFLAGS) -c -o $@ lparser.c
|
|
|
|
lcode.o:
|
|
- $(CC) $(CFLAGS) $(CMCFLAGS) -c lcode.c
|
|
+ $(CCCOMPILE) $(ALLCFLAGS) $(CMCFLAGS) -c -o $@ lcode.c
|
|
|
|
# DO NOT DELETE
|
|
|