From f1a3adf0210d6f81289f44b8048457d147f308a7 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 20 Sep 2023 10:07:00 -0600
Subject: [PATCH] lua: remove patch, pass variables to make
---
recipes/lua/recipe.toml | 11 +++++++----
recipes/lua/redox.patch | 24 ------------------------
2 files changed, 7 insertions(+), 28 deletions(-)
delete mode 100644 recipes/lua/redox.patch
diff --git a/recipes/lua/recipe.toml b/recipes/lua/recipe.toml
index 9987f6cc5..d51b3aa16 100644
--- a/recipes/lua/recipe.toml
+++ b/recipes/lua/recipe.toml
@@ -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"
"""
diff --git a/recipes/lua/redox.patch b/recipes/lua/redox.patch
deleted file mode 100644
index 1ee05dde8..000000000
--- a/recipes/lua/redox.patch
+++ /dev/null
@@ -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
-
--
GitLab