main/luajit: drop -m32 -m64 cc option

breaks loongarch64 and we dont really support multiarch anyway
This commit is contained in:
Natanael Copa 2025-10-19 17:37:19 +02:00
parent 810e7f0870
commit 53e2db0961
2 changed files with 20 additions and 0 deletions

View File

@ -26,6 +26,7 @@ source="https://github.com/openresty/luajit2/archive/v$_pkgver/$_pkgname-$_pkgve
$pkgname-$pkgver-loongarch64-support.patch::https://github.com/loongson/luajit2/releases/download/v$_pkgver-loongarch64/0001-Add-loongarch64-support-of-all.patch
fix-tests-alpine.patch
module-paths.patch
fix-loongarch64-tests.patch
"
builddir="$srcdir/$_pkgname-$_pkgver"
@ -84,4 +85,5 @@ sha512sums="
58000c35079e77d2b19e3650c65bf3fbc71afd9f274b3ae6f8757b2ce7518bc519f9f3be83e5f73961f7b19ee8e5c0a3097b6d75b59f1a574f9c86cda30d2bd4 luajit-2.1_p20240815-loongarch64-support.patch
684be4199634ac6e52183e98b65c9bcdc99217865c47b83a1f579a9f0e1ec55fb1a5fe8ae2f1293ac561c8c806aef269e451e3d73bf168ec20a4fd343c7a89d4 fix-tests-alpine.patch
9c6c410e142838c5128c70570e66beb53cc5422df5ecfb8ab0b5f362637b21ab5978c00f19bc1759165df162fd6438a2ed43e25020400011b7bb14014d87c62e module-paths.patch
46c0f6fcaadacff5f1d91a91b87ef698aec9280ef7f2c1c426861f8e941817247ab9595b6e8fc4da098dacda21739bff221cb94d1bc24f71b811cd063d950fc1 fix-loongarch64-tests.patch
"

View File

@ -0,0 +1,18 @@
diff --git a/test-suite/test/sysdep/ffi_include_std.lua b/test-suite/test/sysdep/ffi_include_std.lua
index 301c073..d29d554 100644
--- a/test-suite/test/sysdep/ffi_include_std.lua
+++ b/test-suite/test/sysdep/ffi_include_std.lua
@@ -28,12 +28,7 @@ do
]]
fp:close()
- local flags
- if jit.arch == "arm64" then
- flags = ""
- else
- flags = ffi.abi("32bit") and "-m32" or "-m64"
- end
+ local flags = ""
fp = assert(io.popen("cc -E -P -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE /tmp/__tmp.c "..flags))
local s = fp:read("*a")
fp:close()