From 078d7892164ba6578fd625f5c6f46390ee2478ae Mon Sep 17 00:00:00 2001 From: Jehan Date: Thu, 11 Jul 2019 18:46:41 +0200 Subject: [PATCH] build: add missing patch named in flatpak manifest. I did not commit on purpose because this is actually to be found in the official flathub repository for GIMP (the concept being to keep the stable and nightly manifests as sync-ed as possible) and I thought there is no need to duplicate data. But since this is apparently confusing people (cf. !91), let's just push it. Note that even though this patch is taken from the org.octave.Octave flatpak package, it is actually slightly different (I tweaked it because we needed to build even less options from SuiteSpace than they do apparently). --- .../patches/suitesparse-reduce-build.patch | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 build/flatpak/patches/suitesparse-reduce-build.patch diff --git a/build/flatpak/patches/suitesparse-reduce-build.patch b/build/flatpak/patches/suitesparse-reduce-build.patch new file mode 100644 index 0000000000..5560b5e8de --- /dev/null +++ b/build/flatpak/patches/suitesparse-reduce-build.patch @@ -0,0 +1,70 @@ +diff -Naur SuiteSparse.ori/Makefile SuiteSparse/Makefile +--- SuiteSparse.ori/Makefile 2018-12-23 14:31:36.000000000 +0100 ++++ SuiteSparse/Makefile 2019-04-05 15:21:59.287341367 +0200 +@@ -38,24 +38,24 @@ + # (note that CSparse is not installed; CXSparse is installed instead) + install: metisinstall + ( cd SuiteSparse_config && $(MAKE) install ) +- ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) +- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) ++# ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) ++# ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) + ( cd AMD && $(MAKE) install ) +- ( cd BTF && $(MAKE) install ) ++# ( cd BTF && $(MAKE) install ) + ( cd CAMD && $(MAKE) install ) + ( cd CCOLAMD && $(MAKE) install ) + ( cd COLAMD && $(MAKE) install ) + ( cd CHOLMOD && $(MAKE) install ) +- ( cd CXSparse && $(MAKE) install ) +- ( cd LDL && $(MAKE) install ) +- ( cd KLU && $(MAKE) install ) ++# ( cd CXSparse && $(MAKE) install ) ++# ( cd LDL && $(MAKE) install ) ++# ( cd KLU && $(MAKE) install ) + ( cd UMFPACK && $(MAKE) install ) +- ( cd RBio && $(MAKE) install ) ++# ( cd RBio && $(MAKE) install ) + ifneq (,$(GPU_CONFIG)) + ( cd SuiteSparse_GPURuntime && $(MAKE) install ) + ( cd GPUQREngine && $(MAKE) install ) + endif +- ( cd SPQR && $(MAKE) install ) ++# ( cd SPQR && $(MAKE) install ) + # ( cd PIRO_BAND && $(MAKE) install ) + # ( cd SKYLINE_SVD && $(MAKE) install ) + $(CP) README.txt $(INSTALL_DOC)/SuiteSparse_README.txt +@@ -116,25 +116,25 @@ + # the static library + library: metis + ( cd SuiteSparse_config && $(MAKE) ) +- ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) +- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) ++# ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) ++# ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) + ( cd AMD && $(MAKE) library ) +- ( cd BTF && $(MAKE) library ) ++# ( cd BTF && $(MAKE) library ) + ( cd CAMD && $(MAKE) library ) + ( cd CCOLAMD && $(MAKE) library ) + ( cd COLAMD && $(MAKE) library ) + ( cd CHOLMOD && $(MAKE) library ) +- ( cd KLU && $(MAKE) library ) +- ( cd LDL && $(MAKE) library ) ++# ( cd KLU && $(MAKE) library ) ++# ( cd LDL && $(MAKE) library ) + ( cd UMFPACK && $(MAKE) library ) + ( cd CSparse && $(MAKE) library ) +- ( cd CXSparse && $(MAKE) library ) +- ( cd RBio && $(MAKE) library ) ++# ( cd CXSparse && $(MAKE) library ) ++# ( cd RBio && $(MAKE) library ) + ifneq (,$(GPU_CONFIG)) + ( cd SuiteSparse_GPURuntime && $(MAKE) library ) + ( cd GPUQREngine && $(MAKE) library ) + endif +- ( cd SPQR && $(MAKE) library ) ++# ( cd SPQR && $(MAKE) library ) + # ( cd PIRO_BAND && $(MAKE) library ) + # ( cd SKYLINE_SVD && $(MAKE) library ) +