diff options
| author | Efraim Flashner <[email protected]> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <[email protected]> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/patches/scotch-build-parallelism.patch | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/patches/scotch-build-parallelism.patch')
| -rw-r--r-- | gnu/packages/patches/scotch-build-parallelism.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/gnu/packages/patches/scotch-build-parallelism.patch b/gnu/packages/patches/scotch-build-parallelism.patch deleted file mode 100644 index a669f1dbeb..0000000000 --- a/gnu/packages/patches/scotch-build-parallelism.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 \ |