From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- sci-libs/superlu/Manifest | 2 - .../superlu/files/superlu-5.2.1-no-implicits.patch | 153 --------------------- .../superlu/files/superlu-5.2.1-pkgconfig.patch | 29 ---- 3 files changed, 184 deletions(-) delete mode 100644 sci-libs/superlu/files/superlu-5.2.1-no-implicits.patch delete mode 100644 sci-libs/superlu/files/superlu-5.2.1-pkgconfig.patch (limited to 'sci-libs/superlu') diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest index 9841fdaa7b53..4388ed82ca35 100644 --- a/sci-libs/superlu/Manifest +++ b/sci-libs/superlu/Manifest @@ -1,7 +1,5 @@ AUX superlu-4.3-autotools.patch 18676 BLAKE2B c6312a4db288aed46f696b57291268cfe435f531b5cade47f146fce74bdc8e9e7efb6b200448c06b6aa0cd57188d87fe2e20557678e98f83dab07526bcc42d91 SHA512 62f868126af7acc3658bdff6eda8839d06dd14b5195d23a2b7bbbe1008e9258875ac3c9bc4ed40f4ac58443ac4aeef786499b02ff45f2adb304160f3b25b0bf3 AUX superlu-4.3-format-security.patch 312 BLAKE2B 2ab1eaa7072a06abf80373a86e73d3cd131a5dfb1fee370fac330c7932d0b20dc94f2711be077d3739af0f1d6b9779080f0ccf75a65b50156aab35cfd451b7d4 SHA512 86072c671b946a73e8857fcf60499c589c0de8ca2433c2310701a2249eb32968e7ab83e638be1fcee3358d3b1432cba988cf11644962dbf09045b4907b9ebf6a -AUX superlu-5.2.1-no-implicits.patch 4950 BLAKE2B 32a01cb343e21ee870fdfec54f3e529861ddc521966d732430effaad34e442d83f53da222301ff719d81777082ccfa85a262cddf577a8b0320d0a2fc63b1e042 SHA512 9bcf34847baddd7d330638d9115359cd2bd6d7630cc24a8fd9432b83485e6b2f1bb2500971f65b1fe26ec2ca70f7483105e1a02ba4083763ca79794dabe8551a -AUX superlu-5.2.1-pkgconfig.patch 1013 BLAKE2B a36aac6c06fa8cb4bd3d19fcc74b27c092283b209665cb4dc5d3336f4b025f5145a190e76105b5e96f846e02fd4fe43a71b9542937beefe5e8b375b54ad87e05 SHA512 f22dcbaaa6857008b75b8c6481b219b11c09ebcfe2dffe0a4d4f0cba6392f18fc9a5a870b2a8efa7c31df321b78186cbde7cf8739da59dc089fa3b6ae836bf36 AUX superlu-5.2.2-no-internal-blas.patch 733 BLAKE2B d289296570a02914591ed213e1c866124ae29f94348ca5cbfe9313dc581e12aba20fd34741b89b84988365c4c64b14c47d08b82c79870ab57f21dc8d0a0f6370 SHA512 496f5ed971cdd2dfaedf065d5ec52e0c6435506fcace45ed9059cb17d9ea1914cc9b0276b68a250728cc5bcf48a184bca5638e3fcadabd170eb1c8c9d342844c DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c DIST superlu_5.2.2.tar.gz 2481538 BLAKE2B db9d6437c8012f1aeeb3313212298a77e4ef04405c6ec853ceeef8b80426ea80d8b9fc30a0ca2dd7288131a0e21c43e17cafafaa7fb615d6d825b54f4beb84a2 SHA512 091928a3df3433b337ebdacdb28de341d6d29d655965de6ffd656a6de18cf11171555bfd3af73082af62b1cead6835b4c11e4ba524a32db7f7d28db47c9d490c diff --git a/sci-libs/superlu/files/superlu-5.2.1-no-implicits.patch b/sci-libs/superlu/files/superlu-5.2.1-no-implicits.patch deleted file mode 100644 index 587380ce2e35..000000000000 --- a/sci-libs/superlu/files/superlu-5.2.1-no-implicits.patch +++ /dev/null @@ -1,153 +0,0 @@ -diff --git a/SRC/clacon2.c b/SRC/clacon2.c -index 107bb64..39deb83 100644 ---- a/SRC/clacon2.c -+++ b/SRC/clacon2.c -@@ -106,6 +106,11 @@ clacon2_(int *n, complex *v, complex *x, float *est, int *kase, int isave[3]) - extern float smach(char *); - extern int icmax1_slu(int *, complex *, int *); - extern double scsum1_slu(int *, complex *, int *); -+#ifdef _CRAY -+ extern int CCOPY(int *, complex *, int *, complex [], int *); -+#else -+ extern int ccopy_(int *, complex *, int *, complex [], int *); -+#endif - - safmin = smach("Safe minimum"); /* lamch_("Safe minimum"); */ - if ( *kase == 0 ) { -diff --git a/SRC/dmach.c b/SRC/dmach.c -index 73beacb..cafdf1c 100644 ---- a/SRC/dmach.c -+++ b/SRC/dmach.c -@@ -11,6 +11,7 @@ at the top-level directory. - #include - #include - #include -+#include - - double dmach(char *cmach) - { -diff --git a/SRC/ilu_cdrop_row.c b/SRC/ilu_cdrop_row.c -index 4987548..09b8a93 100644 ---- a/SRC/ilu_cdrop_row.c -+++ b/SRC/ilu_cdrop_row.c -@@ -28,6 +28,7 @@ extern void caxpy_(int *, complex *, complex [], int *, complex [], int *); - extern void ccopy_(int *, complex [], int *, complex [], int *); - extern float scasum_(int *, complex *, int *); - extern float scnrm2_(int *, complex *, int *); -+extern void scopy_(int *, float [], int *, float [], int *); - extern double dnrm2_(int *, double [], int *); - extern int icamax_(int *, complex [], int *); - -diff --git a/SRC/ilu_zdrop_row.c b/SRC/ilu_zdrop_row.c -index f434dd9..2de1226 100644 ---- a/SRC/ilu_zdrop_row.c -+++ b/SRC/ilu_zdrop_row.c -@@ -29,6 +29,7 @@ extern void zcopy_(int *, doublecomplex [], int *, doublecomplex [], int *); - extern double dzasum_(int *, doublecomplex *, int *); - extern double dznrm2_(int *, doublecomplex *, int *); - extern double dnrm2_(int *, double [], int *); -+extern void dcopy_(int *, double [], int *, double [], int *); - extern int izamax_(int *, doublecomplex [], int *); - - static double *A; /* used in _compare_ only */ -diff --git a/SRC/slacon2.c b/SRC/slacon2.c -index 7c93341..50efe78 100644 ---- a/SRC/slacon2.c -+++ b/SRC/slacon2.c -@@ -157,7 +157,7 @@ L40: - #ifdef _CRAY - isave[1] = ISAMAX(n, &x[0], &c__1); /* j */ - #else -- isave[1] = idamax_(n, &x[0], &c__1); /* j */ -+ isave[1] = isamax_(n, &x[0], &c__1); /* j */ - #endif - --isave[1]; /* --j; */ - isave[2] = 2; /* iter = 2; */ -diff --git a/SRC/smach.c b/SRC/smach.c -index fff6c5f..0b69991 100644 ---- a/SRC/smach.c -+++ b/SRC/smach.c -@@ -11,6 +11,7 @@ at the top-level directory. - #include - #include - #include -+#include - - float smach(char *cmach) - { -diff --git a/SRC/sp_ienv.c b/SRC/sp_ienv.c -index 855d901..ce2865e 100644 ---- a/SRC/sp_ienv.c -+++ b/SRC/sp_ienv.c -@@ -24,6 +24,7 @@ at the top-level directory. - * History: Modified from lapack routine ILAENV - */ - #include "slu_Cnames.h" -+extern int input_error(char *, int *); - - /*! \brief - -diff --git a/SRC/zlacon2.c b/SRC/zlacon2.c -index b43c619..ed5f2b7 100644 ---- a/SRC/zlacon2.c -+++ b/SRC/zlacon2.c -@@ -106,6 +106,11 @@ zlacon2_(int *n, doublecomplex *v, doublecomplex *x, double *est, int *kase, int - extern double dmach(char *); - extern int izmax1_slu(int *, doublecomplex *, int *); - extern double dzsum1_slu(int *, doublecomplex *, int *); -+#ifdef _CRAY -+ extern int CCOPY(int *, doublecomplex *, int *, doublecomplex *, int *); -+#else -+ extern int zcopy_(int *, doublecomplex *, int *, doublecomplex *, int *); -+#endif - - safmin = dmach("Safe minimum"); /* lamch_("Safe minimum"); */ - if ( *kase == 0 ) { -diff --git a/TESTING/zdrive.c b/TESTING/zdrive.c -index 23e96fc..1e7d0aa 100644 ---- a/TESTING/zdrive.c -+++ b/TESTING/zdrive.c -@@ -21,6 +21,7 @@ at the top-level directory. - * Purpose: MAIN test program - */ - #include -+#include - #include "slu_zdefs.h" - - #define NTESTS 5 /* Number of test types */ -diff --git a/TESTING/cdrive.c b/TESTING/cdrive.c -index 8bc8d10..00fe0d8 100644 ---- a/TESTING/cdrive.c -+++ b/TESTING/cdrive.c -@@ -21,6 +21,7 @@ at the top-level directory. - * Purpose: MAIN test program - */ - #include -+#include - #include "slu_cdefs.h" - - #define NTESTS 5 /* Number of test types */ -diff --git a/TESTING/sdrive.c b/TESTING/sdrive.c -index 5b98038..cba0c83 100644 ---- a/TESTING/sdrive.c -+++ b/TESTING/sdrive.c -@@ -21,6 +21,7 @@ at the top-level directory. - * Purpose: MAIN test program - */ - #include -+#include - #include "slu_sdefs.h" - - #define NTESTS 5 /* Number of test types */ -diff --git a/TESTING/ddrive.c b/TESTING/ddrive.c -index 2c3f6fe..35685c5 100644 ---- a/TESTING/ddrive.c -+++ b/TESTING/ddrive.c -@@ -21,6 +21,7 @@ at the top-level directory. - * Purpose: MAIN test program - */ - #include -+#include - #include "slu_ddefs.h" - - #define NTESTS 5 /* Number of test types */ diff --git a/sci-libs/superlu/files/superlu-5.2.1-pkgconfig.patch b/sci-libs/superlu/files/superlu-5.2.1-pkgconfig.patch deleted file mode 100644 index 63252dffdb57..000000000000 --- a/sci-libs/superlu/files/superlu-5.2.1-pkgconfig.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d8abc1b..5883b34 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -143,3 +143,6 @@ endif() - # ${CMAKE_C_COMPILER} ) - configure_file(${CMAKE_SOURCE_DIR}/make.inc.in ${CMAKE_SOURCE_DIR}/make.inc) - -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/superlu.pc.in ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc @ONLY) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -diff --git a/superlu.pc.in b/superlu.pc.in -new file mode 100644 -index 0000000..09b1fff ---- /dev/null -+++ b/superlu.pc.in -@@ -0,0 +1,12 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -+includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ -+ -+Name: @CMAKE_PROJECT_NAME@ -+Description: Direct solution of large, sparse systems of linear equations -+Version: @PROJECT_VERSION@ -+URL: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/ -+ -+Libs: -L${libdir} -lsuperlu -+Libs.private: @BLAS_LIB@ -lm -+Cflags: -I${includedir} -- cgit v1.2.3