summaryrefslogtreecommitdiff
path: root/math/mumps/files
diff options
context:
space:
mode:
Diffstat (limited to 'math/mumps/files')
-rw-r--r--math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR89
-rw-r--r--math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ73
-rw-r--r--math/mumps/files/patch-Makefile20
-rw-r--r--math/mumps/files/patch-PORD_lib_Makefile23
-rw-r--r--math/mumps/files/patch-examples_Makefile15
-rw-r--r--math/mumps/files/patch-libseq_Makefile27
-rw-r--r--math/mumps/files/patch-src_Makefile53
7 files changed, 300 insertions, 0 deletions
diff --git a/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR b/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR
new file mode 100644
index 000000000000..a42435038545
--- /dev/null
+++ b/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR
@@ -0,0 +1,89 @@
+--- Make.inc/Makefile.FREEBSD10.PAR.orig 2017-08-08 07:32:58 UTC
++++ Make.inc/Makefile.FREEBSD10.PAR
+@@ -20,7 +20,7 @@
+ #
+
+ #SCOTCHDIR = ${HOME}/scotch_6.0
+-#ISCOTCH = -I$(SCOTCHDIR)/include
++ISCOTCH = -I@LOCALBASE@/include
+ #
+ # You have to choose one among the following two lines depending on
+ # the type of analysis you want to perform. If you want to perform only
+@@ -28,16 +28,16 @@
+ # variable below); for both parallel and sequential analysis choose the second
+ # line (remember to add -Dptscotch in the ORDERINGSF variable below)
+
+-#LSCOTCH = -L$(SCOTCHDIR)/lib -lesmumps -lscotch -lscotcherr
+-#LSCOTCH = -L$(SCOTCHDIR)/lib -lptesmumps -lptscotch -lptscotcherr
++#LSCOTCH = -L@LOCALBASE@/lib -lesmumps -lscotch -lscotcherr
++LSCOTCH = -L@LOCALBASE@/lib -lptesmumps -lptscotch -lptscotcherr
+
+
+ LPORDDIR = $(topdir)/PORD/lib/
+ IPORD = -I$(topdir)/PORD/include/
+ LPORD = -L$(LPORDDIR) -lpord
+
+-#LMETISDIR = /opt/metis-5.1.0/build/Linux-x86_64/libmetis
+-#IMETIS = /opt/metis-5.1.0/include
++LMETISDIR = @LOCALBASE@/lib/parmetis
++IMETIS = @LOCALBASE@/include/parmetis
+
+ # You have to choose one among the following two lines depending on
+ # the type of analysis you want to perform. If you want to perform only
+@@ -46,7 +46,7 @@ LPORD = -L$(LPORDDIR) -lpord
+ # line (remember to add -Dparmetis in the ORDERINGSF variable below)
+
+ #LMETIS = -L$(LMETISDIR) -lmetis
+-#LMETIS = -L$(LMETISDIR) -lparmetis -lmetis
++LMETIS = -L$(LMETISDIR) -lparmetis -lmetis
+
+ # The following variables will be used in the compilation process.
+ # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively.
+@@ -66,34 +66,34 @@ IORDERINGSC = $(IMETIS) $(IPORD) $(ISCOT
+
+ PLAT =
+ LIBEXT = .a
+-OUTC = -o ""
+-OUTF = -o ""
++OUTC = -o
++OUTF = -o
+ RM = /bin/rm -f
+-CC = cc
+-FC = gfortran48
+-FL = gfortran48
++CC = @CC@
++FC = @FC@
++FL = @FC@
+ # keep a space at the end if options have to be separated from lib name
+-AR = ar -vr ""
++AR = ar -vr
+ RANLIB = ranlib
+ LAPACK = -llapack
+-SCALAP = -lscalapack -lblacs
++SCALAP = -L@LOCALBASE@/lib -lblacs -lblacsc -lblacsf77 -lscalapack
+
+ INCPAR = -I/usr/local/include
+-LIBPAR = $(SCALAP) $(LAPACK) -L/usr/local/lib -lmpi
++LIBPAR = -L@LOCALBASE@/lib -lfmpich -lmpich -lmpl $(SCALAP)
+
+ INCSEQ = -I$(topdir)/libseq
+ LIBSEQ = $(LAPACK) -L$(topdir)/libseq -lmpiseq
+-LIBBLAS = -lblas
+-LIBOTHERS = -lpthread
++LIBBLAS = -L@LOCALBASE@/lib @LAPACK_LIBS@ @BLAS_LIBS@
++LIBOTHERS = -lpthread @GCCLIBDIR@ @FORTRANLIBS@
+
+ #Preprocessor defs for calling Fortran from C (-DAdd_ or -DAdd__ or -DUPPER)
+-CDEFS = -DAdd_
++CDEFS ?= -DAdd_
+
+ #Begin Optimized options
+ # uncomment -fopenmp in lines below to benefit from OpenMP
+-OPTF = -O #-fopenmp
++OPTF = @FCFLAGS@ #-fopenmp
+ OPTL = -O #-fopenmp
+-OPTC = -O -I. #-fopenmp
++OPTC = @CFLAGS@ -I. #-fopenmp
+ #End Optimized options
+ INCS = $(INCPAR)
+ LIBS = $(LIBPAR)
diff --git a/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ b/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ
new file mode 100644
index 000000000000..a1ac8868dd67
--- /dev/null
+++ b/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ
@@ -0,0 +1,73 @@
+--- Make.inc/Makefile.FREEBSD10.SEQ.orig 2017-08-08 07:32:58 UTC
++++ Make.inc/Makefile.FREEBSD10.SEQ
+@@ -20,7 +20,7 @@
+ #
+
+ #SCOTCHDIR = ${HOME}/scotch_6.0
+-#ISCOTCH = -I$(SCOTCHDIR)/include
++ISCOTCH = -I@LOCALBASE@/include
+ #
+ # You have to choose one among the following two lines depending on
+ # the type of analysis you want to perform. If you want to perform only
+@@ -36,8 +36,8 @@ LPORDDIR = $(topdir)/PORD/lib/
+ IPORD = -I$(topdir)/PORD/include/
+ LPORD = -L$(LPORDDIR) -lpord
+
+-#LMETISDIR = /opt/metis-5.1.0/build/Linux-x86_64/libmetis
+-#IMETIS = /opt/metis-5.1.0/include
++LMETISDIR = @LOCALBASE@/lib
++IMETIS = @LOCALBASE@/include
+
+ # You have to choose one among the following two lines depending on
+ # the type of analysis you want to perform. If you want to perform only
+@@ -45,7 +45,7 @@ LPORD = -L$(LPORDDIR) -lpord
+ # variable below); for both parallel and sequential analysis choose the second
+ # line (remember to add -Dparmetis in the ORDERINGSF variable below)
+
+-#LMETIS = -L$(LMETISDIR) -lmetis
++LMETIS = -L$(LMETISDIR) -lmetis
+ #LMETIS = -L$(LMETISDIR) -lparmetis -lmetis
+
+ # The following variables will be used in the compilation process.
+@@ -66,14 +66,14 @@ IORDERINGSC = $(IMETIS) $(IPORD) $(ISCOT
+
+ PLAT =
+ LIBEXT = .a
+-OUTC = -o ""
+-OUTF = -o ""
++OUTC = -o
++OUTF = -o
+ RM = /bin/rm -f
+-CC = cc
+-FC = gfortran48
+-FL = gfortran48
++CC = @CC@
++FC = @FC@
++FL = @FC@
+ # keep a space at the end if options have to be separated from lib name
+-AR = ar -vr ""
++AR = ar -vr
+ RANLIB = ranlib
+ LAPACK = -llapack
+
+@@ -81,16 +81,16 @@ LAPACK = -llapack
+ INCSEQ = -I$(topdir)/libseq
+ LIBSEQ = $(LAPACK) -L$(topdir)/libseq -lmpiseq
+ LIBBLAS = -lblas
+-LIBOTHERS = -lpthread
++LIBOTHERS = -lpthread @GCCLIBDIR@ @FORTRANLIBS@
+
+ #Preprocessor defs for calling Fortran from C (-DAdd_ or -DAdd__ or -DUPPER)
+-CDEFS = -DAdd_
++CDEFS ?= -DAdd_
+
+ #Begin Optimized options
+ # uncomment -fopenmp in lines below to benefit from OpenMP
+-OPTF = -O #-fopenmp
++OPTF = @FCFLAGS@ #-fopenmp
+ OPTL = -O #-fopenmp
+-OPTC = -O -I. #-fopenmp
++OPTC = @CFLAGS@ -I. #-fopenmp
+ #End Optimized options
+ INCS = $(INCSEQ)
+ LIBS = $(LIBSEQ)
diff --git a/math/mumps/files/patch-Makefile b/math/mumps/files/patch-Makefile
new file mode 100644
index 000000000000..731981025fdc
--- /dev/null
+++ b/math/mumps/files/patch-Makefile
@@ -0,0 +1,20 @@
+--- Makefile.orig 2017-08-08 07:32:58 UTC
++++ Makefile
+@@ -54,7 +54,7 @@ dexamples: d
+ multi_example: s d c z
+ (cd examples ; $(MAKE) multi)
+
+-requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT)
++requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT) $(libdir)/libpord$(PLAT).so.@SOVER@
+
+ # dummy MPI library (sequential version)
+
+@@ -68,7 +68,7 @@ $(libdir)/libpord$(PLAT)$(LIBEXT):
+ $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT=$(LIBEXT); \
+ fi;
+ if [ "$(LPORDDIR)" != "" ] ; then \
+- cp $(LPORDDIR)/libpord$(LIBEXT) $@; \
++ cp $(LPORDDIR)/libpord* $(libdir)/; \
+ fi;
+
+ clean:
diff --git a/math/mumps/files/patch-PORD_lib_Makefile b/math/mumps/files/patch-PORD_lib_Makefile
new file mode 100644
index 000000000000..b13ad0eea785
--- /dev/null
+++ b/math/mumps/files/patch-PORD_lib_Makefile
@@ -0,0 +1,23 @@
+--- PORD/lib/Makefile.orig 2017-08-08 07:32:58 UTC
++++ PORD/lib/Makefile
+@@ -22,12 +22,17 @@ OBJS = graph.o gbipart.o gbisect.o ddcre
+ # OUTC = -o
+
+ .c.o:
+- $(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o
++ $(CC) $(COPTIONS) -c $*.c $(OUTC) $*.o
+
+-libpord$(LIBEXT):$(OBJS)
+- $(AR)$@ $(OBJS)
++all: libpord$(LIBEXT) libpord.so.@SOVER@
++
++libpord$(LIBEXT): $(OBJS)
++ $(AR) $@ $(OBJS)
+ $(RANLIB) $@
+
++libpord.so.@SOVER@: $(OBJS)
++ $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT).so.@SOVER@ -o libpord$(PLAT).so.@SOVER@
++
+ clean:
+ rm -f *.o
+
diff --git a/math/mumps/files/patch-examples_Makefile b/math/mumps/files/patch-examples_Makefile
new file mode 100644
index 000000000000..69740489ab6a
--- /dev/null
+++ b/math/mumps/files/patch-examples_Makefile
@@ -0,0 +1,15 @@
+--- examples/Makefile.orig 2017-08-08 07:32:58 UTC
++++ examples/Makefile
+@@ -57,9 +57,10 @@ multiple_arithmetics_example: $(LIBSMUMP
+
+ .SUFFIXES: .c .F .o
+ .F.o:
+- $(FC) $(OPTF) $(INCS) -I. -I$(topdir)/include -c $*.F $(OUTF)$*.o
++ $(FC) $(OPTF) $(INCS) -I. -I$(topdir)/include -c $*.F $(OUTF) $*.o
++
+ .c.o:
+- $(CC) $(OPTC) $(INCS) $(CDEFS) -I. -I$(topdir)/include -I$(topdir)/src -c $*.c $(OUTC)$*.o
++ $(CC) $(OPTC) $(INCS) $(CDEFS) -I. -I$(topdir)/include -I$(topdir)/src -c $*.c $(OUTC) $*.o
+
+
+ $(libdir)/libsmumps$(PLAT)$(LIBEXT):
diff --git a/math/mumps/files/patch-libseq_Makefile b/math/mumps/files/patch-libseq_Makefile
new file mode 100644
index 000000000000..6b8b95b0d229
--- /dev/null
+++ b/math/mumps/files/patch-libseq_Makefile
@@ -0,0 +1,27 @@
+--- libseq/Makefile.orig 2017-08-08 07:32:58 UTC
++++ libseq/Makefile
+@@ -8,15 +8,20 @@ all: libmpiseq
+
+ include ../Makefile.inc
+
+-libmpiseq: libmpiseq$(PLAT)$(LIBEXT)
++libmpiseq: libmpiseq$(PLAT)$(LIBEXT) libmpiseq$(PLAT).so.@SOVER@
+
+ libmpiseq$(PLAT)$(LIBEXT): mpi.o mpic.o elapse.o
+- $(AR)$@ mpi.o mpic.o elapse.o
++ $(AR) $@ mpi.o mpic.o elapse.o
+ $(RANLIB) $@
++
++libmpiseq$(PLAT).so.@SOVER@: mpi.o mpic.o elapse.o
++ $(FC) -shared ${.ALLSRC} -Wl,-soname,libmpiseq$(PLAT).so.@SOVER@ -o libmpiseq$(PLAT).so.@SOVER@
++
+ .f.o:
+- $(FC) $(OPTF) -c $*.f $(OUTF)$*.o
++ $(FC) $(OPTF) -c $*.f $(OUTF) $*.o
++
+ .c.o:
+- $(CC) $(OPTC) $(CDEFS) -I. -c $*.c $(OUTC)$*.o
++ $(CC) $(OPTC) $(CDEFS) -I. -c $*.c $(OUTC) $*.o
+
+ clean:
+ $(RM) *.o *$(LIBEXT)
diff --git a/math/mumps/files/patch-src_Makefile b/math/mumps/files/patch-src_Makefile
new file mode 100644
index 000000000000..6756a0652a75
--- /dev/null
+++ b/math/mumps/files/patch-src_Makefile
@@ -0,0 +1,53 @@
+--- src/Makefile.orig 2017-08-08 07:32:58 UTC
++++ src/Makefile
+@@ -24,7 +24,9 @@ z:
+ include $(topdir)/Makefile.inc
+
+ mumps_lib: $(libdir)/libmumps_common$(PLAT)$(LIBEXT) \
+- $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT)
++ $(libdir)/libmumps_common$(PLAT).so.@SOVER@ \
++ $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT) \
++ $(libdir)/lib$(ARITH)mumps$(PLAT).so.@SOVER@
+
+ OBJS_COMMON_MOD = \
+ lr_common.o \
+@@ -168,13 +170,19 @@ OBJS_OTHER = \
+ $(ARITH)type3_root.o
+
+ $(libdir)/libmumps_common$(PLAT)$(LIBEXT): $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER)
+- $(AR)$@ $?
++ $(AR) $@ $?
+ $(RANLIB) $@
+
++$(libdir)/libmumps_common$(PLAT).so.@SOVER@: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER)
++ $(FC) -shared ${.ALLSRC} -Wl,-soname,libmumps_common$(PLAT).so.@SOVER@ -L$(libdir) $(LORDERINGS) $(LIBPAR) $(LIBOTHERS) -o $(libdir)/libmumps_common$(PLAT).so.@SOVER@
++
+ $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS_MOD) $(OBJS_OTHER)
+- $(AR)$@ $?
++ $(AR) $@ $?
+ $(RANLIB) $@
+
++$(libdir)/lib$(ARITH)mumps$(PLAT).so.@SOVER@: $(OBJS_MOD) $(OBJS_OTHER)
++ $(FC) -shared ${.ALLSRC} -Wl,-soname,lib$(ARITH)mumps$(PLAT).so.@SOVER@ -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(LIBPAR) -lblas $(SCALAP) $(LIBOTHERS) -o $(libdir)/lib$(ARITH)mumps$(PLAT).so.@SOVER@
++
+ # Dependencies between modules:
+ $(ARITH)mumps_load.o: $(ARITH)mumps_comm_buffer.o \
+ $(ARITH)mumps_struc_def.o \
+@@ -290,13 +298,14 @@ $(OBJS_OTHER):$(OBJS_COMMON_MOD) $(OBJS_
+
+ .SUFFIXES: .c .F .o
+ .F.o:
+- $(FC) $(OPTF) $(INCS) $(IORDERINGSF) $(ORDERINGSF) -I. -I../include -c $*.F $(OUTF)$*.o
++ $(FC) $(OPTF) $(INCS) $(IORDERINGSF) $(ORDERINGSF) -I. -I../include -c $*.F $(OUTF) $*.o
++
+ .c.o:
+- $(CC) $(OPTC) $(INCS) -I../include $(CDEFS) $(IORDERINGSC) $(ORDERINGSC) -c $*.c $(OUTC)$*.o
++ $(CC) $(OPTC) $(INCS) -I../include $(CDEFS) $(IORDERINGSC) $(ORDERINGSC) -c $*.c $(OUTC) $*.o
+
+ $(ARITH)mumps_c.o: mumps_c.c
+ $(CC) $(OPTC) $(INCS) $(CDEFS) -DMUMPS_ARITH=MUMPS_ARITH_$(ARITH) \
+- $(IORDERINGSC) $(ORDERINGSC) -I../include -c mumps_c.c $(OUTC)$@
++ $(IORDERINGSC) $(ORDERINGSC) -I../include -c mumps_c.c $(OUTC) $@
+
+
+ clean: