summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Fabbro <bicatali@gentoo.org>2016-12-14 05:12:01 +0000
committerSébastien Fabbro <bicatali@gentoo.org>2016-12-19 23:50:52 +0000
commit9c608169bb07b4b7749a7a039b31a6a3c1991147 (patch)
tree0f9f9b0d66fbd3fe1a6230d2c6b8fa10b3d007f2 /sci-libs/superlu/files
parentwww-servers/apache: Removed old. (diff)
downloadgentoo-9c608169bb07b4b7749a7a039b31a6a3c1991147.tar.gz
gentoo-9c608169bb07b4b7749a7a039b31a6a3c1991147.tar.bz2
gentoo-9c608169bb07b4b7749a7a039b31a6a3c1991147.zip
sci-libs/superlu: version bump with patches
- upstream move to cmake - added patch to remove implicit declarations - added patch to install a pkg-config file Package-Manager: portage-2.3.3
Diffstat (limited to 'sci-libs/superlu/files')
-rw-r--r--sci-libs/superlu/files/superlu-5.2.1-no-implicits.patch153
-rw-r--r--sci-libs/superlu/files/superlu-5.2.1-pkgconfig.patch29
2 files changed, 182 insertions, 0 deletions
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
new file mode 100644
index 000000000000..587380ce2e35
--- /dev/null
+++ b/sci-libs/superlu/files/superlu-5.2.1-no-implicits.patch
@@ -0,0 +1,153 @@
+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 <float.h>
+ #include <math.h>
+ #include <stdio.h>
++#include <string.h>
+
+ 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 <float.h>
+ #include <math.h>
+ #include <stdio.h>
++#include <string.h>
+
+ 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 <string.h>
++#include <unistd.h>
+ #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 <string.h>
++#include <unistd.h>
+ #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 <string.h>
++#include <unistd.h>
+ #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 <string.h>
++#include <unistd.h>
+ #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
new file mode 100644
index 000000000000..63252dffdb57
--- /dev/null
+++ b/sci-libs/superlu/files/superlu-5.2.1-pkgconfig.patch
@@ -0,0 +1,29 @@
+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}