build/linux: Antecipate some Clang changes to properly work on aarch64

Despite we not building gimp nightly on aarch64 we need to sync with beta.

So, this updates to LLVM/Clang 18, which fixes 'gexiv2' and 'poppler'
problems with deps on that arch. 'json-c' and 'luajit'  were adjusted too
with the use of proper build options to fix errors.
This commit is contained in:
Bruno 2024-06-30 08:35:39 -03:00
parent 78c85f6f45
commit ad7ef08ea0
2 changed files with 10 additions and 12 deletions

View File

@ -26,7 +26,7 @@ if [ -z "$GITLAB_CI" ]; then
flatpak install --user gnome-nightly org.gnome.Platform/$ARCH/master org.gnome.Sdk/$ARCH/master -y
fi
flatpak remote-add --if-not-exists --user --from flathub https://dl.flathub.org/repo/flathub.flatpakrepo
flatpak install --user flathub org.freedesktop.Sdk.Extension.llvm17 -y
flatpak install --user flathub org.freedesktop.Sdk.Extension.llvm18 -y
# Clone and build the deps not present in GNOME runtime

View File

@ -5,12 +5,12 @@
"runtime-version": "master",
"sdk": "org.gnome.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.llvm17"
"org.freedesktop.Sdk.Extension.llvm18"
],
"command": "gimp",
"build-options": {
"append-path": "/usr/lib/sdk/llvm17/bin",
"prepend-ld-library-path": "/usr/lib/sdk/llvm17/lib",
"append-path": "/usr/lib/sdk/llvm18/bin",
"prepend-ld-library-path": "/usr/lib/sdk/llvm18/lib",
"env": {
"CC": "ccache clang",
"CXX": "ccache clang++",
@ -395,6 +395,9 @@
{
"name": "json-c",
"buildsystem": "cmake-ninja",
"config-opts": [
"-DDISABLE_WERROR=ON"
],
"sources": [
{
"type": "git",
@ -671,15 +674,10 @@
},
{
"name": "luajit",
"build-options": {
"env": {
"CC": "gcc",
"CXX": "gcc"
},
"cflags-override": true,
"cxxflags-override": true
},
"no-autogen": true,
"make-args": [
"DEFAULT_CC=ccache clang"
],
"cleanup": [
"/lib/*.a",
"/include",