From da139762b7bffd6e98b58a303d8b443189bef87c Mon Sep 17 00:00:00 2001 From: Jeremy Soller <jackpot51@gmail.com> Date: Wed, 20 Sep 2023 09:39:20 -0600 Subject: [PATCH] lua: patch makefile to allow use of cross compiler --- recipes/lua/recipe.toml | 5 ++++- recipes/lua/redox.patch | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 recipes/lua/redox.patch diff --git a/recipes/lua/recipe.toml b/recipes/lua/recipe.toml index b0a6d8f85..9987f6cc5 100644 --- a/recipes/lua/recipe.toml +++ b/recipes/lua/recipe.toml @@ -1,10 +1,13 @@ [source] tar = "https://www.lua.org/ftp/lua-5.4.4.tar.gz" +patches = [ + "redox.patch" +] + [build] template = "custom" script = """ rsync -av --delete "${COOKBOOK_SOURCE}/" ./ -export CC="${TARGET}-gcc -std=gnu99" "${COOKBOOK_MAKE}" generic -j"${COOKBOOK_MAKE_JOBS}" 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 new file mode 100644 index 000000000..1ee05dde8 --- /dev/null +++ b/recipes/lua/redox.patch @@ -0,0 +1,24 @@ +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