From dc51c83974ed4f4fcc0ef927c5e7f86eeb2cbf2c8babc7f16427a1eb0be99a01 Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Tue, 18 Jun 2024 17:18:38 +0000 Subject: [PATCH] - Add export LUA_INCLUDE="-I/usr/include/luajit-5_1-2.1" so that we are finally building with LuaJIT headers. * I don't know why the configure file does not detect them by default are they placed in a non-standard location? * Since the headers exist I will close boo#1226307 I guess... OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=48 --- sile.changes | 9 +++++++++ sile.spec | 10 +++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/sile.changes b/sile.changes index 82c5de5..69f378e 100644 --- a/sile.changes +++ b/sile.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 18 17:16:10 UTC 2024 - Gordon Leung + +- Add export LUA_INCLUDE="-I/usr/include/luajit-5_1-2.1" + so that we are finally building with LuaJIT headers. + * I don't know why the configure file does not detect them by default + are they placed in a non-standard location? + * Since the headers exist I will close boo#1226307 I guess... + ------------------------------------------------------------------- Tue Jun 18 15:10:43 UTC 2024 - Soc Virnyl Estela diff --git a/sile.spec b/sile.spec index 03830e3..34ed626 100644 --- a/sile.spec +++ b/sile.spec @@ -30,7 +30,6 @@ Source3: LICENSE # Lua modules BuildRequires: luajit -BuildRequires: lua51-devel BuildRequires: lua51-bit32 BuildRequires: luajit-devel Requires: lua51-bit32 @@ -177,11 +176,9 @@ unset LIBSSH2_SYS_USE_PKG_CONFIG export RUSTFLAGS=" -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 -C incremental=false -C strip=none" export CARGO_AUDITABLE=auditable export CARGO_FEATURE_VENDORED=1 -# boo#1226307 -# Force configure file to use lua5.1 includes rather than luajit includes -export LUA_INCLUDE="-I/usr/include/lua5.1" -export CFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" -export CXXFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" +export LUA_INCLUDE="-I/usr/include/luajit-5_1-2.1" +export CFLAGS="%optflags $(pkg-config --cflags-only-I luajit)" +export CXXFLAGS="%optflags $(pkg-config --cflags-only-I luajit)" %configure \ --disable-static \ --disable-embeded-resources \ @@ -197,7 +194,6 @@ unset LIBSSH2_SYS_USE_PKG_CONFIG export RUSTFLAGS=" -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 -C incremental=false -C strip=none" export CARGO_AUDITABLE=auditable export CARGO_FEATURE_VENDORED=1 -# Force configure file to use lua5.1 includes rather than luajit includes export LUA_INCLUDE="$(pkg-config --cflags-only-I luajit)" export CFLAGS="%optflags $(pkg-config --cflags-only-I luajit)" export CXXFLAGS="%optflags $(pkg-config --cflags-only-I luajit)"