diff options
| author | Javier Alvarez <javier.alvarez@allthingsembedded.net> | 2021-12-27 21:05:37 +0100 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2021-12-28 00:24:32 +0100 |
| commit | 4b47daaadca7dd3547c2572885cdc5f5eddc5a02 (patch) | |
| tree | 648e80e169f9e343654259a1dbde6f72fd8e9cd4 | |
| parent | 7c6fc79c236b69c251d2155614bac022a4af95f4 (diff) | |
| download | serenity-4b47daaadca7dd3547c2572885cdc5f5eddc5a02.zip | |
Ports: Make lua buildable on x86_64
Our lua Makefile patch contained hardcoded binaries from the i686
toolchain. Use the CC, AR, and RANLIB variables from .port_include.sh
instead to make it architecture independent.
| -rwxr-xr-x | Ports/lua/package.sh | 2 | ||||
| -rw-r--r-- | Ports/lua/patches/lua.patch | 34 |
2 files changed, 15 insertions, 21 deletions
diff --git a/Ports/lua/package.sh b/Ports/lua/package.sh index 928ad9e368..5e4ba8b286 100755 --- a/Ports/lua/package.sh +++ b/Ports/lua/package.sh @@ -3,5 +3,5 @@ port=lua version=5.3.6 files="http://www.lua.org/ftp/lua-${version}.tar.gz lua-${version}.tar.gz fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60" auth_type=sha256 -makeopts=("-j$(nproc)" "serenity") +makeopts=("-j$(nproc)" "serenity" "CC=${CC}" "AR=${AR}" "RANLIB=${RANLIB}") installopts=("INSTALL_TOP=${SERENITY_INSTALL_ROOT}/usr/local") diff --git a/Ports/lua/patches/lua.patch b/Ports/lua/patches/lua.patch index 948374826f..28348203f6 100644 --- a/Ports/lua/patches/lua.patch +++ b/Ports/lua/patches/lua.patch @@ -1,18 +1,6 @@ -diff -Naur lua-5.3.5/Makefile lua-5.3.5.serenity/Makefile ---- lua-5.3.5/Makefile 2016-12-20 11:26:08.000000000 -0500 -+++ lua-5.3.5.serenity/Makefile 2020-04-18 03:41:23.000000000 -0400 -@@ -36,7 +36,7 @@ - # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= - - # Convenience platforms targets. --PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris -+PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris serenity - - # What to install. - TO_BIN= lua luac -diff -Naur lua-5.3.5/src/Makefile lua-5.3.5.serenity/src/Makefile ---- lua-5.3.5/src/Makefile 2018-06-25 13:46:36.000000000 -0400 -+++ lua-5.3.5.serenity/src/Makefile 2020-04-18 03:51:15.000000000 -0400 +diff -Naur lua-5.3.6/src/Makefile lua-5.3.6.serenity/src/Makefile +--- lua-5.3.6/src/Makefile 2020-07-13 20:38:14.000000000 +0200 ++++ lua-5.3.6.serenity/src/Makefile 2021-12-27 21:33:37.015610414 +0100 @@ -26,7 +26,7 @@ # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= @@ -22,16 +10,22 @@ diff -Naur lua-5.3.5/src/Makefile lua-5.3.5.serenity/src/Makefile LUA_A= liblua.a CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ -@@ -124,6 +124,15 @@ +@@ -100,7 +100,6 @@ + @echo '*** C89 does not guarantee 64-bit integers for Lua.' + @echo '' + +- + freebsd: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -I/usr/include/edit" SYSLIBS="-Wl,-E -ledit" CC="cc" + +@@ -124,6 +123,13 @@ solaris: $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_REENTRANT" SYSLIBS="-ldl" +serenity: -+ # FIXME: Replace these with $CC, $AR, $RANLIB + $(MAKE) $(ALL) \ -+ CC="i686-pc-serenity-gcc -std=gnu99" \ -+ AR="i686-pc-serenity-ar rcu" \ -+ RANLIB="i686-pc-serenity-ranlib" \ ++ CC="$(CC) -std=gnu99" \ ++ AR="$(AR) rcu" \ + SYSCFLAGS="-DLUA_USE_DLOPEN" \ + SYSLIBS="-ldl" + |