summary refs log tree commit diff
path: root/gnu/packages/patches/scotch-build-parallelism.patch
diff options
context:
space:
mode:
authorEric Bavier <bavier@cray.com>2018-03-02 14:05:34 -0600
committerEric Bavier <bavier@member.fsf.org>2018-04-26 20:54:18 -0500
commitd98e9009a934f7c12e2241b072ad469a009468de (patch)
tree83c65185884453a11c5b5f6ef26ee252882c79f1 /gnu/packages/patches/scotch-build-parallelism.patch
parentc2e76b7082ee5af27765b0d3ac50810e076fe514 (diff)
downloadguix-d98e9009a934f7c12e2241b072ad469a009468de.tar.gz
gnu: scotch: Update to 6.0.5a.
* gnu/packages/patches/pt-scotch-build-parallelism.patch: Delete files.
* gnu/packages/patches/scotch-build-parallelism.patch,
gnu/packages/patches/scotch-graph-diam-64.patch,
gnu/packages/patches/scotch-graph-induce-type-64.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/maths.scm (scotch): Update to 6.0.5a.
[source](patches): Adjust accordingly.
Diffstat (limited to 'gnu/packages/patches/scotch-build-parallelism.patch')
-rw-r--r--gnu/packages/patches/scotch-build-parallelism.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/gnu/packages/patches/scotch-build-parallelism.patch b/gnu/packages/patches/scotch-build-parallelism.patch
new file mode 100644
index 0000000000..a669f1dbeb
--- /dev/null
+++ b/gnu/packages/patches/scotch-build-parallelism.patch
@@ -0,0 +1,39 @@
+Fixes make with -j, otherwise scotch.h may not be generated by the time make
+tries to compile library_graph_diam.o et al.
+
+Reported upstream at
+https://gforge.inria.fr/tracker/index.php?func=detail&aid=21651&group_id=248&atid=1081
+
+diff --git a/src/libscotch/Makefile b/src/libscotch/Makefile
+index 9898894..b0ee14c 100644
+--- a/src/libscotch/Makefile
++++ b/src/libscotch/Makefile
+@@ -2229,6 +2229,28 @@ library_graph_color_f$(OBJ)	:	library_graph_color_f.c			\
+ 					common.h				\
+ 					scotch.h
+ 
++library_graph_diam$(OBJ)	:	library_graph_diam.c			\
++					module.h				\
++					common.h				\
++					graph.h					\
++					scotch.h
++
++library_graph_diam_f$(OBJ)	:	library_graph_diam.c			\
++					module.h				\
++					common.h				\
++					scotch.h
++
++library_graph_induce$(OBJ)	:	library_graph_diam.c			\
++					module.h				\
++					common.h				\
++					graph.h					\
++					scotch.h
++
++library_graph_induce_f$(OBJ)	:	library_graph_diam.c			\
++					module.h				\
++					common.h				\
++					scotch.h
++
+ library_graph_io_chac$(OBJ)	:	library_graph_io_chac.c			\
+ 					module.h				\
+ 					common.h				\