[suitesparse] 06/08: graphblas-build.patch: new patch for GraphBLAS build system.

[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 50ded858d672d75367e46945ae3726127086fea8
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Dec 21 21:35:33 2017 +0100

    graphblas-build.patch: new patch for GraphBLAS build system.
---
 debian/patches/graphblas-build.patch | 71 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 72 insertions(+)

diff --git a/debian/patches/graphblas-build.patch b/debian/patches/graphblas-build.patch
new file mode 100644
index 0000000..bac1723
--- /dev/null
+++ b/debian/patches/graphblas-build.patch
@@ -0,0 +1,71 @@
+Description: Misc fixes for GraphBLAS build system
+ - replace "make" by "$(MAKE)" (in particular to facilitate parallel builds)
+ - introduce the variable $(CMAKE_OPTIONS) to allow passing options to cmake
+ - demo script: avoid failure if last diff returns non-zero value (and add shebang)
+ - do not recurse into GraphBLAS when running the "static" target at top-level,
+   otherwise both dynamic and static libraries will be built twice
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: by private e-mail to Tim Davis on 2012-12-21
+Last-Update: 2017-12-21 <YYYY-MM-DD, last update of the meta-information, optional>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/GraphBLAS/Makefile
++++ b/GraphBLAS/Makefile
+@@ -1,18 +1,18 @@
+ # simple Makefile for GraphBLAS, relies on cmake
+ 
+ default:
+-	( cd build ; cmake .. ; make ; cd ../Demo ; ./demo )
++	( cd build ; cmake $(CMAKE_OPTIONS) .. ; $(MAKE) ; cd ../Demo ; ./demo )
+ 
+ library:
+-	( cd build ; cmake .. ; make )
++	( cd build ; cmake $(CMAKE_OPTIONS) .. ; $(MAKE) )
+ 
+ static: library
+ 
+ install:
+-	( cd build ; cmake .. ; make ; make install )
++	( cd build ; cmake $(CMAKE_OPTIONS) .. ; $(MAKE) ; $(MAKE) install )
+ 
+ docs:
+-	( cd Doc ; make )
++	( cd Doc ; $(MAKE) )
+ 
+ uninstall:
+ 	- xargs rm < build/install_manifest.txt
+@@ -23,7 +23,7 @@ purge: distclean
+ 
+ distclean:
+ 	rm -rf build/* Demo/*_demo.out Demo/complex_demo_out.m
+-	( cd Test ; make distclean )
+-	( cd Tcov ; make distclean )
+-	( cd Doc  ; make distclean )
++	( cd Test ; $(MAKE) distclean )
++	( cd Tcov ; $(MAKE) distclean )
++	( cd Doc  ; $(MAKE) distclean )
+ 
+--- a/Makefile
++++ b/Makefile
+@@ -137,7 +137,6 @@ endif
+ # and GraphBLAS, which are only dynamic)
+ static: metis
+ 	( cd SuiteSparse_config && $(MAKE) static )
+-	( cd GraphBLAS && $(MAKE) static )
+ 	( cd AMD && $(MAKE) static )
+ 	( cd BTF && $(MAKE) static )
+ 	( cd CAMD && $(MAKE) static )
+--- a/GraphBLAS/Demo/demo
++++ b/GraphBLAS/Demo/demo
+@@ -1,3 +1,5 @@
++#!/bin/sh
++
+ ../build/simple_demo                           > simple_demo.out
+ ../build/complex_demo                          > complex_demo_out.m
+ ../build/wildtype_demo                         > wildtype_demo.out
+@@ -72,3 +74,4 @@ diff -I time Output/bfs_demo.out
+ diff -I time Output/mis_demo.out          mis_demo.out
+ diff -I time -I rate -I usage Output/tri_demo.out  tri_demo.out
+ 
++exit 0
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 896fdf1..33ec6ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 buildflags.patch
+graphblas-build.patch

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