From 84beba20cb5c7aaaa95241a255d4fd6b3aa9305c Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Sat, 30 Jan 2021 16:21:22 -0500 Subject: [PATCH] meson: fix luajit 64-bit builds Upstream defines ENDIAN_LE or ENDIAN_BE always, so assume little endian. x86_64 defaulting to x86 seems to just be a mistake --- subprojects/packagefiles/luajit/meson.build | 2 ++ subprojects/packagefiles/luajit/src/host/meson.build | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/subprojects/packagefiles/luajit/meson.build b/subprojects/packagefiles/luajit/meson.build index d321d7fa5..d005ac853 100644 --- a/subprojects/packagefiles/luajit/meson.build +++ b/subprojects/packagefiles/luajit/meson.build @@ -10,6 +10,8 @@ system_deps = [ # compat flag is needed for both the buildvm code generator (compiled natively) and luajit itself add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', language: 'c', native: true) add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', language: 'c', native: false) +add_project_arguments('-DENDIAN_LE', language: 'c', native: true) +add_project_arguments('-DENDIAN_LE', language: 'c', native: false) if host_machine.system() == 'linux' add_project_arguments('-DLUAJIT_OS=LUAJIT_OS_LINUX', language: 'c', native: true) readline_dep = cc.find_library('readline') diff --git a/subprojects/packagefiles/luajit/src/host/meson.build b/subprojects/packagefiles/luajit/src/host/meson.build index ce0a6e244..ff74a3c7a 100644 --- a/subprojects/packagefiles/luajit/src/host/meson.build +++ b/subprojects/packagefiles/luajit/src/host/meson.build @@ -3,7 +3,7 @@ minilua = executable('minilua', 'minilua.c', native: true) if host_machine.cpu_family() == 'x86_64' - dynasm_arch = 'x86' + dynasm_arch = 'x64' else dynasm_arch = host_machine.cpu_family() endif