diff options
Diffstat (limited to 'math/primme/files')
| -rw-r--r-- | math/primme/files/patch-examples_Makefile | 11 | ||||
| -rw-r--r-- | math/primme/files/patch-tests_COMMON_num.h | 11 | ||||
| -rw-r--r-- | math/primme/files/patch-tests_Makefile | 15 |
3 files changed, 23 insertions, 14 deletions
diff --git a/math/primme/files/patch-examples_Makefile b/math/primme/files/patch-examples_Makefile new file mode 100644 index 000000000000..e3b18cd23de1 --- /dev/null +++ b/math/primme/files/patch-examples_Makefile @@ -0,0 +1,11 @@ +--- examples/Makefile.orig 2018-10-28 03:29:33 UTC ++++ examples/Makefile +@@ -8,7 +8,7 @@ include ../Link_flags + + override INCLUDE += -I../include + override FINCLUDE += -I../include +-LIBS := ../lib/libprimme.a $(LIBS) ++LIBS := ../lib/libprimme.so $(LIBS) + + EXAMPLES_C = ex_eigs_dseq ex_eigs_zseq ex_svds_dseq ex_svds_zseq + EXAMPLES_CXX = ex_eigs_zseqxx ex_svds_zseqxx diff --git a/math/primme/files/patch-tests_COMMON_num.h b/math/primme/files/patch-tests_COMMON_num.h deleted file mode 100644 index 083294d771fe..000000000000 --- a/math/primme/files/patch-tests_COMMON_num.h +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/COMMON/num.h.orig 2018-10-08 17:28:33 UTC -+++ tests/COMMON/num.h -@@ -42,7 +42,7 @@ - #endif - #define Sprimme CONCAT(SCALAR_PRE,primme) - #define Sprimme_svds CONCAT(SCALAR_PRE,primme_svds) --#if !(defined (__APPLE__) && defined (__MACH__)) -+#if !(defined (__APPLE__) && defined (__MACH__)) && !defined(__FreeBSD__) - # include <malloc.h> /* malloc */ - #endif - #include <stdlib.h> /* malloc, free */ diff --git a/math/primme/files/patch-tests_Makefile b/math/primme/files/patch-tests_Makefile index 63f39cf5312d..3cc3f1ce5cc6 100644 --- a/math/primme/files/patch-tests_Makefile +++ b/math/primme/files/patch-tests_Makefile @@ -1,11 +1,20 @@ ---- tests/Makefile.orig 2018-10-08 19:10:07 UTC +--- tests/Makefile.orig 2018-10-28 03:25:47 UTC +++ tests/Makefile @@ -9,7 +9,7 @@ include ../Link_flags SOBJS= COMMON/shared_utils.o COMMON/ioandtest.o COMMON_INCLUDE = -I./COMMON -I../include override INCLUDE += $(COMMON_INCLUDE) --LIBDIRS += -L../lib -+LIBDIRS += ../lib/libprimme.so +-LIBS := ../lib/libprimme.a $(LIBS) ++LIBS := ../lib/libprimme.so $(LIBS) USE_NATIVE ?= yes USE_PETSC ?= $(if $(findstring undefined,$(origin PETSC_DIR)),no,yes) +@@ -89,7 +89,7 @@ all: drivers + + drivers: primme_double primme_doublecomplex primmesvds_double primmesvds_doublecomplex + +-primme_double primme_doublecomplex primmesvds_double primmesvds_doublecomplex: ../lib/libprimme.a ++primme_double primme_doublecomplex primmesvds_double primmesvds_doublecomplex: ../lib/libprimme.so + + ifeq ($(USE_MPI), yes) + MPIRUN ?= mpirun -np 4 |