guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

10/13: gnu: Remove unused scotch patches.


From: guix-commits
Subject: 10/13: gnu: Remove unused scotch patches.
Date: Mon, 3 Oct 2022 11:19:18 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit a93781b83cfc83cdd74c11bf4931cca4002c2048
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Oct 2 22:23:09 2022 -0400

    gnu: Remove unused scotch patches.
    
    * gnu/packages/patches/scotch-build-parallelism.patch: Delete file.
    * gnu/packages/patches/scotch-integer-declarations.patch: Likewise.
    * gnu/local.mk (dist_patch_DATA): De-register them.
---
 gnu/local.mk                                       |  2 --
 .../patches/scotch-build-parallelism.patch         | 39 ----------------------
 .../patches/scotch-integer-declarations.patch      | 37 --------------------
 3 files changed, 78 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 789aacb77b..e9178923af 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1823,8 +1823,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/scalapack-gcc-10-compilation.patch      \
   %D%/packages/patches/scheme48-tests.patch                    \
   %D%/packages/patches/scons-test-environment.patch            \
-  %D%/packages/patches/scotch-build-parallelism.patch          \
-  %D%/packages/patches/scotch-integer-declarations.patch       \
   %D%/packages/patches/screen-hurd-path-max.patch              \
   %D%/packages/patches/sdl-libx11-1.6.patch                    \
   %D%/packages/patches/seed-webkit.patch                       \
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                                
\
diff --git a/gnu/packages/patches/scotch-integer-declarations.patch 
b/gnu/packages/patches/scotch-integer-declarations.patch
deleted file mode 100644
index 978625c1c0..0000000000
--- a/gnu/packages/patches/scotch-integer-declarations.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/libscotch/library.h b/src/libscotch/library.h
-index 1891c19..ecc0533 100644
---- a/src/libscotch/library.h
-+++ b/src/libscotch/library.h
-@@ -67,6 +67,8 @@
- 
- /*+ Integer type. +*/
- 
-+#include <stdint.h>
-+
- typedef DUMMYIDX SCOTCH_Idx;
- 
- typedef DUMMYINT SCOTCH_Num;
-diff --git a/src/libscotchmetis/library_metis.h 
b/src/libscotchmetis/library_metis.h
-index e6767e1..04e71c3 100644
---- a/src/libscotchmetis/library_metis.h
-+++ b/src/libscotchmetis/library_metis.h
-@@ -99,6 +99,7 @@ typedef enum {
- */
- 
- #ifndef SCOTCH_H                                  /* In case "scotch.h" not 
included before */
-+#include <stdint.h>
- typedef DUMMYINT SCOTCH_Num;
- #endif /* SCOTCH_H */
- 
-diff --git a/src/libscotchmetis/library_parmetis.h 
b/src/libscotchmetis/library_parmetis.h
-index 6d2f0b0..3c803fc 100644
---- a/src/libscotchmetis/library_parmetis.h
-+++ b/src/libscotchmetis/library_parmetis.h
-@@ -106,6 +106,7 @@ typedef enum {
- */
- 
- #ifndef SCOTCH_H                                  /* In case "scotch.h" not 
included before */
-+#include <stdint.h>
- typedef DUMMYINT SCOTCH_Num;
- #endif /* SCOTCH_H */
- 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]