lua: remove patch, pass variables to make

This commit is contained in:
Jeremy Soller 2023-09-20 10:07:00 -06:00
parent da139762b7
commit f1a3adf021
No known key found for this signature in database
GPG Key ID: DCFCA852D3906975
2 changed files with 7 additions and 28 deletions

View File

@ -1,14 +1,17 @@
[source]
tar = "https://www.lua.org/ftp/lua-5.4.4.tar.gz"
patches = [
"redox.patch"
]
blake3 = "ca54489393cd38e35d295a9c35dbf0da5336a66ddb7b2213eed6c2f3039f53b1"
[build]
template = "custom"
script = """
rsync -av --delete "${COOKBOOK_SOURCE}/" ./
"${COOKBOOK_MAKE}" generic -j"${COOKBOOK_MAKE_JOBS}"
"${COOKBOOK_MAKE}" -j"${COOKBOOK_MAKE_JOBS}" \
AR="${TARGET}-ar rcu" \
CC="${TARGET}-gcc -std=gnu99" \
RANLIB="${TARGET}-ranlib" \
SYSLDFLAGS="-static" \
generic
mkdir -pv "${COOKBOOK_STAGE}/bin"
cp src/lua src/luac "${COOKBOOK_STAGE}/bin"
"""

View File

@ -1,24 +0,0 @@
diff -ruwN lua-5.4.4/src/Makefile source/src/Makefile
--- lua-5.4.4/src/Makefile 2021-07-15 08:01:52.000000000 -0600
+++ source/src/Makefile 2023-09-20 09:43:33.165057570 -0600
@@ -4,15 +4,15 @@
# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
# Your platform. See PLATS for possible values.
-PLAT= guess
+PLAT= generic
-CC= gcc -std=gnu99
+CC= $(TARGET)-gcc -std=gnu99
CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
-LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+LDFLAGS= -static $(SYSLDFLAGS) $(MYLDFLAGS)
LIBS= -lm $(SYSLIBS) $(MYLIBS)
-AR= ar rcu
-RANLIB= ranlib
+AR= $(TARGET)-ar rcu
+RANLIB= $(TARGET)-ranlib
RM= rm -f
UNAME= uname