mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-05 04:06:38 +08:00
Merge branch 'lua' into 'master'
Fix lua-compat compilation, fix openttd prefix See merge request redox-os/redox!2371
This commit is contained in:
commit
bb24a6d468
@ -1,6 +1,9 @@
|
||||
[source]
|
||||
tar = "https://lua.org/ftp/lua-5.4.7.tar.gz"
|
||||
blake3 = "e51c2f347e3185479d5ff95cae8ac77511db486853269443c56bedaa0a6ae629"
|
||||
patches = [
|
||||
"redox.patch"
|
||||
]
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
|
||||
12
recipes/dev/lua54/redox.patch
Normal file
12
recipes/dev/lua54/redox.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ruwN source/src/ldo.c source-new/src/ldo.c
|
||||
--- source/src/ldo.c 2024-06-13 22:15:09.000000000 +0000
|
||||
+++ source-new/src/ldo.c 2026-09-30 05:11:35.697677914 +0000
|
||||
@@ -60,7 +60,7 @@
|
||||
try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; }
|
||||
#define luai_jmpbuf int /* dummy variable */
|
||||
|
||||
-#elif defined(LUA_USE_POSIX) /* }{ */
|
||||
+#elif defined(LUA_USE_POSIX) && !defined(__redox__) /* }{ */
|
||||
|
||||
/* in POSIX, try _longjmp/_setjmp (more efficient) */
|
||||
#define LUAI_THROW(L,c) _longjmp((c)->b, 1)
|
||||
@ -26,7 +26,7 @@ rsync -av --delete "${COOKBOOK_SOURCE}/" ./
|
||||
./configure \\
|
||||
--build="$(gcc -dumpmachine)" \\
|
||||
--host="${TARGET}" \\
|
||||
--prefix="" \\
|
||||
--prefix="/usr" \\
|
||||
--disable-static \\
|
||||
--without-liblzo2 \\
|
||||
--disable-network \\
|
||||
|
||||
@ -6,6 +6,10 @@ dependencies = [
|
||||
"lua54"
|
||||
]
|
||||
script = """
|
||||
mkdir -pv "${COOKBOOK_STAGE}/include"
|
||||
cp -r "$COOKBOOK_SOURCE/c-api/." "${COOKBOOK_STAGE}/include"
|
||||
${CC} -O2 -fPIC ${CPPFLAGS} -c "${COOKBOOK_SOURCE}/c-api/compat-5.3.c" -o compat-5.3.o
|
||||
${AR} rcs libcompat53.a compat-5.3.o
|
||||
|
||||
mkdir -p "${COOKBOOK_STAGE}/usr/lib" "${COOKBOOK_STAGE}/usr/include"
|
||||
cp libcompat53.a "${COOKBOOK_STAGE}/usr/lib/"
|
||||
cp "${COOKBOOK_SOURCE}/c-api/compat-5.3.h" "${COOKBOOK_STAGE}/usr/include/"
|
||||
"""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user