RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:37:44 +00:00
Code Issues Activity Actions

Ports: Make lua buildable on x86_64

Browse source 
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.
This commit is contained in:
Javier Alvarez 2021-12-27 21:05:37 +01:00 • committed by Linus Groh
parent 7c6fc79c23
commit 4b47daaadc
2 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ports/lua/package.sh
View file

@ -3,5 +3,5 @@ port=lua
version=5.3.6 version=5.3.6
files="http://www.lua.org/ftp/lua-${version}.tar.gz lua-${version}.tar.gz fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60" files="http://www.lua.org/ftp/lua-${version}.tar.gz lua-${version}.tar.gz fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60"
auth_type=sha256 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") installopts=("INSTALL_TOP=${SERENITY_INSTALL_ROOT}/usr/local")

34
Ports/lua/patches/lua.patch
View file

@ -1,18 +1,6 @@
diff -Naur lua-5.3.5/Makefile lua-5.3.5.serenity/Makefile diff -Naur lua-5.3.6/src/Makefile lua-5.3.6.serenity/src/Makefile
--- lua-5.3.5/Makefile 2016-12-20 11:26:08.000000000 -0500 --- lua-5.3.6/src/Makefile 2020-07-13 20:38:14.000000000 +0200
+++ lua-5.3.5.serenity/Makefile 2020-04-18 03:41:23.000000000 -0400 +++ lua-5.3.6.serenity/src/Makefile 2021-12-27 21:33:37.015610414 +0100
@@ -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
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= # == 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 LUA_A= liblua.a
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ 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: solaris:
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_REENTRANT" SYSLIBS="-ldl" $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_REENTRANT" SYSLIBS="-ldl"
+serenity: +serenity:
+ # FIXME: Replace these with $CC, $AR, $RANLIB
+ $(MAKE) $(ALL) \ + $(MAKE) $(ALL) \
+ CC="i686-pc-serenity-gcc -std=gnu99" \ + CC="$(CC) -std=gnu99" \
+ AR="i686-pc-serenity-ar rcu" \ + AR="$(AR) rcu" \
+ RANLIB="i686-pc-serenity-ranlib" \
+ SYSCFLAGS="-DLUA_USE_DLOPEN" \ + SYSCFLAGS="-DLUA_USE_DLOPEN" \
+ SYSLIBS="-ldl" + SYSLIBS="-ldl"
+ +