[suitesparse] 07/08: Adapt build system to new GraphBLAS setup.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository suitesparse.

commit c6c94e2a92a4c61d59d005561bf28e08737ce100
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Dec 21 21:36:00 2017 +0100

    Adapt build system to new GraphBLAS setup.
---
 debian/rules | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/debian/rules b/debian/rules
index 703ea04..bdb5d13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,58 +2,48 @@
 
 include /usr/share/dpkg/default.mk
 
+# Flags for traditional Makefiles (all libs except GraphBLAS)
 COMMON_FLAGS := BLAS=-lblas MY_METIS_LIB=-lmetis
 PIC_FLAGS := $(COMMON_FLAGS) OPTIMIZATION=-fPIC
 NOPIC_FLAGS := $(COMMON_FLAGS) OPTIMIZATION=
 
+# Flags for cmake (only GraphBLAS)
+export CMAKE_OPTIONS := -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_C_FLAGS_RELEASE="$(CFLAGS) $(CPPFLAGS)" -DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS) $(CPPFLAGS)"
+
+# All static libs (except GraphBLAS static which is handled by cmake)
 STATIC_LIBS := CAMD/Lib/libcamd.a BTF/Lib/libbtf.a CHOLMOD/Lib/libcholmod.a AMD/Lib/libamd.a RBio/Lib/librbio.a LDL/Lib/libldl.a SuiteSparse_config/libsuitesparseconfig.a KLU/Lib/libklu.a SPQR/Lib/libspqr.a UMFPACK/Lib/libumfpack.a COLAMD/Lib/libcolamd.a CXSparse/Lib/libcxsparse.a CCOLAMD/Lib/libccolamd.a
 
 PDF_DOCS := AMD/Doc/AMD_UserGuide.pdf CAMD/Doc/CAMD_UserGuide.pdf CHOLMOD/Doc/CHOLMOD_UserGuide.pdf GraphBLAS/Doc/GraphBLAS_UserGuide.pdf KLU/Doc/KLU_UserGuide.pdf UMFPACK/Doc/UMFPACK_QuickStart.pdf UMFPACK/Doc/UMFPACK_UserGuide.pdf LDL/Doc/ldl_userguide.pdf SPQR/Doc/spqr_user_guide.pdf
 
-# For building GraphBLAS
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-else
-NUMJOBS := 1
-endif
-
 %:
 	dh $@
 
-override_dh_auto_configure:
-	mkdir -p GraphBLAS/build
-	cd GraphBLAS/build && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_C_FLAGS_RELEASE="$(CFLAGS) $(CPPFLAGS)" -DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS) $(CPPFLAGS)" ..
-
 # LD_LIBRARY_PATH needed to make tests work (since buildflags.patch removes the -rpath)
 override_dh_auto_build:
 	# Docs must be rebuilt first, because the build system expect them for some libs
 	rm -f $(PDF_DOCS)
 	make docs
-	make -C GraphBLAS/Doc
 
-	# Build static libraries
+	# Build static libraries (except GraphBLAS, see graphblas-build.patch)
 	dh_auto_build -- static $(NOPIC_FLAGS)
 	mkdir static_lib && cp $(STATIC_LIBS) static_lib/
 	make purge
 
-	# Build dynamic libraries
+	# Build dynamic libraries (and GraphBLAS static)
 	LD_LIBRARY_PATH=$$(pwd)/lib dh_auto_build -- $(PIC_FLAGS)
 
-	# Build GraphBLAS (only the dynamic library)
-	make -C GraphBLAS/build -j$(NUMJOBS)
-
 override_dh_auto_install:
-	make install $(PIC_FLAGS) INSTALL=$$(pwd)/debian/tmp/usr INSTALL_LIB=$$(pwd)/debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/ INSTALL_INCLUDE=$$(pwd)/debian/tmp/usr/include/suitesparse INSTALL_DOC=$$(pwd)/debian/tmp/usr/share/doc/suitesparse
-	cp static_lib/* $$(pwd)/debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/
-
-	make -C GraphBLAS/build install DESTDIR=$$(pwd)/debian/tmp
+	# DESTDIR is used by cmake (for GraphBLAS), the INSTALL* vars are used by other libs
+	make install $(PIC_FLAGS) INSTALL=$$(pwd)/debian/tmp/usr INSTALL_LIB=$$(pwd)/debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/ INSTALL_INCLUDE=$$(pwd)/debian/tmp/usr/include/suitesparse INSTALL_DOC=$$(pwd)/debian/tmp/usr/share/doc/suitesparse DESTDIR=$$(pwd)/debian/tmp
+	# Fix name of GraphBLAS static library
+	mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libgraphblas_static.a debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libgraphblas.a
+	# Install static libraries (except GraphBLAS)
+	cp static_lib/* debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/
 
 override_dh_auto_clean:
 	make purge
 	rm -rf static_lib
-	rm -rf GraphBLAS/build/
 	rm -f $(PDF_DOCS)
-	make -C GraphBLAS/Doc clean
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/suitesparse.git