mirror of https://github.com/GNOME/gimp.git
build/linux: Move 'suitesparse' to GEGL module
'suitesparse' is NOT a direct GIMP dependency!
This commit is contained in:
Bruno
parent
accc9011ed
commit
12c2680c4f
|
|
@ -40,16 +40,12 @@ elif [ "$GITLAB_CI" ] || [ "$1" = '--ci' ]; then
|
|||
## Prepare env
|
||||
export GIMP_PREFIX="$PWD/_install"
|
||||
|
||||
## Clone and build deps
|
||||
## Clone and build deps (including babl and GEGL)
|
||||
## (The deps building is too long and no complete output would be collected,
|
||||
## even from GitLab runner messages. So, let's silent and save logs as a file.)
|
||||
echo '(INFO): building dependencies not present in GNOME runtime'
|
||||
flatpak-builder --force-clean --user --disable-rofiles-fuse --keep-build-dirs --build-only --stop-at=babl \
|
||||
"$GIMP_PREFIX" build/linux/flatpak/org.gimp.GIMP-nightly.json &> flatpak-builder.log
|
||||
|
||||
## Let's output at least babl and GEGL building
|
||||
echo '(INFO): building dependencies not present in GNOME runtime (including babl and GEGL)'
|
||||
flatpak-builder --force-clean --user --disable-rofiles-fuse --keep-build-dirs --build-only --stop-at=gimp \
|
||||
"$GIMP_PREFIX" build/linux/flatpak/org.gimp.GIMP-nightly.json
|
||||
"$GIMP_PREFIX" build/linux/flatpak/org.gimp.GIMP-nightly.json &> flatpak-builder.log
|
||||
if [ "$1" != '--ci' ]; then
|
||||
tar cf babl-meson-log.tar .flatpak-builder/build/babl-1/_flatpak_build/meson-logs/meson-log.txt
|
||||
tar cf gegl-meson-log.tar .flatpak-builder/build/gegl-1/_flatpak_build/meson-logs/meson-log.txt
|
||||
|
|
|
|||
|
|
@ -454,70 +454,6 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"//": "Originally taken from org.octave.Octave manifest",
|
||||
"name": "SuiteSparse",
|
||||
"buildsystem": "cmake-ninja",
|
||||
"builddir": true,
|
||||
"config-opts": [
|
||||
"-DBLA_VENDOR=OpenBLAS",
|
||||
"-DGRAPHBLAS_COMPACT=ON",
|
||||
"-DSUITESPARSE_USE_OPENMP=OFF",
|
||||
"-DSUITESPARSE_DEMOS=OFF",
|
||||
"-DBUILD_TESTING=OFF",
|
||||
"-DCMAKE_INSTALL_LIBDIR=/app/lib",
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=/app/include"
|
||||
],
|
||||
"cleanup": [
|
||||
"/bin",
|
||||
"/include",
|
||||
"/lib/pkgconfig"
|
||||
],
|
||||
"sources": [
|
||||
{
|
||||
"type": "archive",
|
||||
"url": "https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v7.6.0.tar.gz",
|
||||
"sha256": "19cbeb9964ebe439413dd66d82ace1f904adc5f25d8a823c1b48c34bd0d29ea5",
|
||||
"x-checker-data": {
|
||||
"type": "anitya",
|
||||
"project-id": 4908,
|
||||
"stable-only": true,
|
||||
"url-template": "https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$version.tar.gz"
|
||||
}
|
||||
}
|
||||
],
|
||||
"modules": [
|
||||
{
|
||||
"name": "openblas",
|
||||
"no-autogen": true,
|
||||
"make-args": [
|
||||
"DYNAMIC_ARCH=0",
|
||||
"USE_OPENMP=0",
|
||||
"NO_LAPACKE=1"
|
||||
],
|
||||
"make-install-args": [
|
||||
"PREFIX=/app"
|
||||
],
|
||||
"cleanup": [
|
||||
"/include",
|
||||
"/lib/pkgconfig"
|
||||
],
|
||||
"sources": [
|
||||
{
|
||||
"type": "archive",
|
||||
"url": "https://github.com/xianyi/OpenBLAS/archive/v0.3.27.tar.gz",
|
||||
"sha256": "aa2d68b1564fe2b13bc292672608e9cdeeeb6dc34995512e65c3b10f4599e897",
|
||||
"x-checker-data": {
|
||||
"type": "anitya",
|
||||
"project-id": 2540,
|
||||
"stable-only": true,
|
||||
"url-template": "https://github.com/xianyi/OpenBLAS/archive/v$version.tar.gz"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "libheif",
|
||||
"buildsystem": "cmake-ninja",
|
||||
|
|
@ -834,6 +770,70 @@
|
|||
}
|
||||
],
|
||||
"modules": [
|
||||
{
|
||||
"//": "Originally taken from org.octave.Octave manifest",
|
||||
"name": "SuiteSparse",
|
||||
"buildsystem": "cmake-ninja",
|
||||
"builddir": true,
|
||||
"config-opts": [
|
||||
"-DBLA_VENDOR=OpenBLAS",
|
||||
"-DGRAPHBLAS_COMPACT=ON",
|
||||
"-DSUITESPARSE_USE_OPENMP=OFF",
|
||||
"-DSUITESPARSE_DEMOS=OFF",
|
||||
"-DBUILD_TESTING=OFF",
|
||||
"-DCMAKE_INSTALL_LIBDIR=/app/lib",
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=/app/include"
|
||||
],
|
||||
"cleanup": [
|
||||
"/bin",
|
||||
"/include",
|
||||
"/lib/pkgconfig"
|
||||
],
|
||||
"sources": [
|
||||
{
|
||||
"type": "archive",
|
||||
"url": "https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v7.6.0.tar.gz",
|
||||
"sha256": "19cbeb9964ebe439413dd66d82ace1f904adc5f25d8a823c1b48c34bd0d29ea5",
|
||||
"x-checker-data": {
|
||||
"type": "anitya",
|
||||
"project-id": 4908,
|
||||
"stable-only": true,
|
||||
"url-template": "https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$version.tar.gz"
|
||||
}
|
||||
}
|
||||
],
|
||||
"modules": [
|
||||
{
|
||||
"name": "openblas",
|
||||
"no-autogen": true,
|
||||
"make-args": [
|
||||
"DYNAMIC_ARCH=0",
|
||||
"USE_OPENMP=0",
|
||||
"NO_LAPACKE=1"
|
||||
],
|
||||
"make-install-args": [
|
||||
"PREFIX=/app"
|
||||
],
|
||||
"cleanup": [
|
||||
"/include",
|
||||
"/lib/pkgconfig"
|
||||
],
|
||||
"sources": [
|
||||
{
|
||||
"type": "archive",
|
||||
"url": "https://github.com/xianyi/OpenBLAS/archive/v0.3.27.tar.gz",
|
||||
"sha256": "aa2d68b1564fe2b13bc292672608e9cdeeeb6dc34995512e65c3b10f4599e897",
|
||||
"x-checker-data": {
|
||||
"type": "anitya",
|
||||
"project-id": 2540,
|
||||
"stable-only": true,
|
||||
"url-template": "https://github.com/xianyi/OpenBLAS/archive/v$version.tar.gz"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "maxflow",
|
||||
"buildsystem": "cmake-ninja",
|
||||
|
|
|
|||
Loading…
Reference in New Issue