procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 01:43:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
build/linux/flatpak/1_build-deps-flatpak.sh
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 flatpak install --user gnome-nightly org.gnome.Platform/$ARCH/master org.gnome.Sdk/$ARCH/master -y
fi fi
flatpak remote-add --if-not-exists --user --from flathub https://dl.flathub.org/repo/flathub.flatpakrepo 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 # Clone and build the deps not present in GNOME runtime

20
build/linux/flatpak/org.gimp.GIMP-nightly.json
View file

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