From 0ece15a40390ada7362868fef278a0ae184565d10eb38be76644ed64576e0456 Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Fri, 14 Jun 2024 16:59:27 +0000 Subject: [PATCH] - Switch back to gcc because clang fails on armv7l OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=42 --- sile.changes | 1 + sile.spec | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/sile.changes b/sile.changes index 89e5246..e1e9aa5 100644 --- a/sile.changes +++ b/sile.changes @@ -6,6 +6,7 @@ Fri Jun 14 16:42:20 UTC 2024 - Gordon Leung - Document that we are using lua51 includes because luajit includes are missing from the openSUSE package * boo#1226307 +- Switch back to gcc because clang fails on armv7l ------------------------------------------------------------------- Fri Jun 14 10:20:53 UTC 2024 - Soc Virnyl Estela diff --git a/sile.spec b/sile.spec index 51dbb9a..09822c0 100644 --- a/sile.spec +++ b/sile.spec @@ -107,9 +107,6 @@ Suggests: hack-fonts # Rust build dependencies. We don't need cargo packaging. # Sile has a flags we have to respect it BuildRequires: cargo -# Attempt to also use clang too. Seems this is what they used -BuildRequires: clang -BuildRequires: clang-devel # For tar scm lol BuildRequires: zstd @@ -177,8 +174,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 -export CXX=/usr/bin/clang++ -export CC=/usr/bin/clang # boo#1226307 # Force configure file to use lua5.1 includes rather than luajit includes export LUA_INCLUDE="-I/usr/include/lua5.1" @@ -199,8 +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 -export CXX=/usr/bin/clang++ -export CC=/usr/bin/clang # boo#1226307 # Force configure file to use lua5.1 includes rather than luajit includes export LUA_INCLUDE="-I/usr/include/lua5.1"