Revision: 140102 https://trac.macports.org/changeset/140102 Author: sean@macports.org Date: 2015-09-09 14:27:20 -0700 (Wed, 09 Sep 2015) Log Message: ----------- mumps: update to 5.0.1 Modified Paths: -------------- trunk/dports/math/mumps/Portfile Added Paths: ----------- trunk/dports/math/mumps/files/patch-shared.diff Removed Paths: ------------- trunk/dports/math/mumps/files/shared.patch Modified: trunk/dports/math/mumps/Portfile =================================================================== --- trunk/dports/math/mumps/Portfile 2015-09-09 21:27:18 UTC (rev 140101) +++ trunk/dports/math/mumps/Portfile 2015-09-09 21:27:20 UTC (rev 140102) @@ -5,7 +5,7 @@ PortGroup mpi 1.0 name mumps -version 4.10.0 +version 5.0.1 categories math license public-domain platforms darwin @@ -21,17 +21,15 @@ distname MUMPS_${version} -checksums rmd160 19ae1f4773ab1643237f791085d9721932a618fc \ - sha256 d0f86f91a74c51a17a2ff1be9c9cee2338976f13a6d00896ba5b43a5ca05d933 +checksums rmd160 f5a99de1a9ee7e28c6f9fddac0a4852ec660109e \ + sha256 50355b2e67873e2239b4998a46f2bbf83f70cdad6517730ab287ae3aae9340a0 mpi.setup require require_fortran mpi.enforce_variant scalapack patch.pre_args -p1 -patchfiles-append metis.patch \ - metis-wgts.patch \ - shared.patch +patchfiles-append patch-shared.diff use_parallel_build no use_configure no @@ -44,7 +42,7 @@ configure.f90flags -fPIC -O3 -mtune=native post-extract { - file copy ${worksrcpath}/Make.inc/Makefile.gfortran.PAR ${worksrcpath}/Makefile.inc + file copy ${worksrcpath}/Make.inc/Makefile.inc.generic ${worksrcpath}/Makefile.inc reinplace "s|^\#LMETISDIR.*$|LMETISDIR = ${prefix}/lib|" ${worksrcpath}/Makefile.inc reinplace "s|^\#IMETIS.*$|IMETIS = -I${prefix}/include|" ${worksrcpath}/Makefile.inc reinplace "s|^\#LMETIS.*$|LMETIS = ${prefix}/lib/libparmetis.dylib ${prefix}/lib/libmetis.dylib|" ${worksrcpath}/Makefile.inc @@ -58,10 +56,9 @@ reinplace "s|^AR.*$|AR = ar cr |" ${worksrcpath}/Makefile.inc reinplace "s|^RANLIB.*$|RANLIB = ranlib -c|" ${worksrcpath}/Makefile.inc reinplace "s|^SCALAP.*$|SCALAP = ${prefix}/lib/libscalapack.dylib|" ${worksrcpath}/Makefile.inc - reinplace "s|^INCPAR.*$|INCPAR = |" ${worksrcpath}/Makefile.inc + reinplace "s|^INCPAR.*$|INCPAR = -I\$(topdir)/include|" ${worksrcpath}/Makefile.inc reinplace "s|^LIBPAR.*$|LIBPAR = \$(SCALAP)|" ${worksrcpath}/Makefile.inc reinplace "s|^LIBBLAS.*$|LIBBLAS = -framework Accelerate|" ${worksrcpath}/Makefile.inc - reinplace "s|inline|static inline|" ${worksrcpath}/include/mumps_compat.h } destroot { Added: trunk/dports/math/mumps/files/patch-shared.diff =================================================================== --- trunk/dports/math/mumps/files/patch-shared.diff (rev 0) +++ trunk/dports/math/mumps/files/patch-shared.diff 2015-09-09 21:27:20 UTC (rev 140102) @@ -0,0 +1,152 @@ +# HG changeset patch +# User Sean Farley <sean@farley.io> +# Date 1441402434 25200 +# Fri Sep 04 14:33:54 2015 -0700 +# Node ID 97dce7b75782630f6b2bd6e8269976131c33d428 +# Parent 639d86d784b8a454f8dba9e03f6f6f62539e714b +make: add rule for shared library + +This works by putting libmumps_common objects into the other libs. + +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -60,20 +60,25 @@ libseqneeded: + + # Build the libpord.a library and copy it into $(topdir)/lib + $(libdir)/libpord$(PLAT)$(LIBEXT): + if [ "$(LPORDDIR)" != "" ] ; then \ + cd $(LPORDDIR); \ +- $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT=$(LIBEXT); \ ++ $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT=$(LIBEXT) PLAT=$(PLAT) SHAREDLIBEXT=$(SHAREDLIBEXT) SHAREDFLAGS="$(SHAREDFLAGS)" PREFIX=$(PREFIX); \ + fi; + if [ "$(LPORDDIR)" != "" ] ; then \ +- cp $(LPORDDIR)/libpord$(LIBEXT) $@; \ ++ if [ -s "$(LPORDDIR)/libpord$(PLAT)$(LIBEXT)" ] ; then \ ++ cp $(LPORDDIR)/libpord$(PLAT)$(LIBEXT) $(libdir)/libpord$(PLAT)$(LIBEXT); \ ++ fi; \ ++ if [ -s "$(LPORDDIR)/libpord$(PLAT)$(SHAREDLIBEXT)" ] ; then \ ++ cp $(LPORDDIR)/libpord$(PLAT)$(SHAREDLIBEXT) $(libdir)/libpord$(PLAT)$(SHAREDLIBEXT); \ ++ fi; \ + fi; + + clean: + (cd src; $(MAKE) clean) + (cd examples; $(MAKE) clean) +- (cd $(libdir); $(RM) *$(PLAT)$(LIBEXT)) ++ (cd $(libdir); $(RM) *$(PLAT)$(LIBEXT) *$(PLAT)$(SHAREDLIBEXT)) + (cd libseq; $(MAKE) clean) + if [ "$(LPORDDIR)" != "" ] ; then \ + cd $(LPORDDIR); $(MAKE) realclean; \ + fi; + +diff --git a/PORD/lib/Makefile b/PORD/lib/Makefile +--- a/PORD/lib/Makefile ++++ b/PORD/lib/Makefile +@@ -22,14 +22,15 @@ OBJS = graph.o gbipart.o gbisect.o ddcre + # OUTC = -o + + .c.o: + $(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o + +-libpord$(LIBEXT):$(OBJS) ++libpord$(PLAT)$(LIBEXT):$(OBJS) + $(AR)$@ $(OBJS) + $(RANLIB) $@ ++ $(CC) $(OBJS) $(CFLAGS) $(SHAREDFLAGS) -install_name $(PREFIX)/lib/libpord$(PLAT)$(SHAREDLIBEXT) -o libpord$(PLAT)$(SHAREDLIBEXT) + + clean: + rm -f *.o + + realclean: +- rm -f *.o libpord.a ++ rm -f *.o libpord$(LIBEXT) libpord$(SHAREDLIBEXT) +diff --git a/examples/Makefile b/examples/Makefile +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -18,32 +18,32 @@ s: ssimpletest + d: dsimpletest c_example + + + include $(topdir)/Makefile.inc + +-LIBMUMPS_COMMON = $(libdir)/libmumps_common$(PLAT)$(LIBEXT) ++LIBMUMPS_COMMON = $(libdir)/libmumps_common$(PLAT)$(SHAREDLIBEXT) + + +-LIBSMUMPS = $(libdir)/libsmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) ++LIBSMUMPS = $(libdir)/libsmumps$(PLAT)$(SHAREDLIBEXT) $(LIBMUMPS_COMMON) + + ssimpletest: $(LIBSMUMPS) $$@.o + $(FL) -o $@ $(OPTL) ssimpletest.o $(LIBSMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) + + +-LIBDMUMPS = $(libdir)/libdmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) ++LIBDMUMPS = $(libdir)/libdmumps$(PLAT)$(SHAREDLIBEXT) $(LIBMUMPS_COMMON) + + dsimpletest: $(LIBDMUMPS) $$@.o + $(FL) -o $@ $(OPTL) dsimpletest.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) + + +-LIBCMUMPS = $(libdir)/libcmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) ++LIBCMUMPS = $(libdir)/libcmumps$(PLAT)$(SHAREDLIBEXT) $(LIBMUMPS_COMMON) + + csimpletest: $(LIBCMUMPS) $$@.o + $(FL) -o $@ $(OPTL) csimpletest.o $(LIBCMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) + + +-LIBZMUMPS = $(libdir)/libzmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) ++LIBZMUMPS = $(libdir)/libzmumps$(PLAT)$(SHAREDLIBEXT) $(LIBMUMPS_COMMON) + + zsimpletest: $(LIBZMUMPS) $$@.o + $(FL) -o $@ $(OPTL) zsimpletest.o $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) + + +@@ -56,23 +56,23 @@ c_example: $(LIBDMUMPS) $$@.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 + + +-$(libdir)/libsmumps$(PLAT)$(LIBEXT): ++$(libdir)/libsmumps$(PLAT)$(SHAREDLIBEXT): + @echo 'Error: you should build the library' $@ 'first' + exit 1 + +-$(libdir)/libdmumps$(PLAT)$(LIBEXT): ++$(libdir)/libdmumps$(PLAT)$(SHAREDLIBEXT): + @echo 'Error: you should build the library' $@ 'first' + exit 1 + +-$(libdir)/libcmumps$(PLAT)$(LIBEXT): ++$(libdir)/libcmumps$(PLAT)$(SHAREDLIBEXT): + @echo 'Error: you should build the library' $@ 'first' + exit 1 + +-$(libdir)/libzmumps$(PLAT)$(LIBEXT): ++$(libdir)/libzmumps$(PLAT)$(SHAREDLIBEXT): + @echo 'Error: you should build the library' $@ 'first' + exit 1 + + $(LIBMUMPS_COMMON): + @echo 'Error: you should build the library' $@ 'first' +diff --git a/src/Makefile b/src/Makefile +--- a/src/Makefile ++++ b/src/Makefile +@@ -155,14 +155,16 @@ OBJS_OTHER = \ + $(ARITH)mumps_restart.o + + $(libdir)/libmumps_common$(PLAT)$(LIBEXT): $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) + $(AR)$@ $? + $(RANLIB) $@ ++ $(FC) $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) $(OPTF) $(SHAREDFLAGS) $(LORDERINGS) $(SCALAP) $(libdir)/libpord$(SHAREDLIBEXT) -install_name $(PREFIX)/lib/libmumps_common$(PLAT)$(SHAREDLIBEXT) -o $(libdir)/libmumps_common$(PLAT)$(SHAREDLIBEXT) + + $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS_MOD) $(OBJS_OTHER) + $(AR)$@ $? + $(RANLIB) $@ ++ $(FC) $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) $(OPTF) $(SHAREDFLAGS) $(LORDERINGS) $(SCALAP) $(libdir)/libpord$(SHAREDLIBEXT) -install_name $(PREFIX)/lib/libmumps_common$(PLAT)$(SHAREDLIBEXT) -o $(libdir)/libmumps_common$(PLAT)$(SHAREDLIBEXT) + + # Dependencies between modules: + $(ARITH)mumps_load.o: $(ARITH)mumps_comm_buffer.o \ + $(ARITH)mumps_struc_def.o \ + fac_future_niv2_mod.o Deleted: trunk/dports/math/mumps/files/shared.patch =================================================================== --- trunk/dports/math/mumps/files/shared.patch 2015-09-09 21:27:18 UTC (rev 140101) +++ trunk/dports/math/mumps/files/shared.patch 2015-09-09 21:27:20 UTC (rev 140102) @@ -1,152 +0,0 @@ -# HG changeset patch -# User Sean Farley <sean@mcs.anl.gov> -# Date 1322301160 21600 -# Sat Nov 26 03:52:40 2011 -0600 -# Node ID 08d452d6944e316a09839f4777fec96c6456b671 -# Parent b8b0cc4abb9bed53f909e0ac38b29d9f76875236 -make: add rule for shared library - -This works by putting libmumps_common objects into the other libs. - -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -60,20 +60,25 @@ libseqneeded: - - # Build the libpord.a library and copy it into $(topdir)/lib - $(libdir)/libpord$(PLAT)$(LIBEXT): - if [ "$(LPORDDIR)" != "" ] ; then \ - cd $(LPORDDIR); \ -- $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC=$(OUTC) LIBEXT=$(LIBEXT); \ -+ $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" PLAT=$(PLAT) OUTC=$(OUTC) LIBEXT=$(LIBEXT) SHAREDLIBEXT=$(SHAREDLIBEXT) SHAREDFLAGS="$(SHAREDFLAGS)" PREFIX=$(PREFIX); \ - fi; - if [ "$(LPORDDIR)" != "" ] ; then \ -- cp $(LPORDDIR)/libpord$(LIBEXT) $@; \ -+ if [ -s "$(LPORDDIR)/libpord$(PLAT)$(LIBEXT)" ] ; then \ -+ cp $(LPORDDIR)/libpord$(PLAT)$(LIBEXT) $(libdir)/libpord$(PLAT)$(LIBEXT); \ -+ fi; \ -+ if [ -s "$(LPORDDIR)/libpord$(PLAT)$(SHAREDLIBEXT)" ] ; then \ -+ cp $(LPORDDIR)/libpord$(PLAT)$(SHAREDLIBEXT) $(libdir)/libpord$(PLAT)$(SHAREDLIBEXT); \ -+ fi; \ - fi; - - clean: - (cd src; $(MAKE) clean) - (cd examples; $(MAKE) clean) -- (cd $(libdir); $(RM) *$(PLAT)$(LIBEXT)) -+ (cd $(libdir); $(RM) *$(PLAT)$(LIBEXT) *$(PLAT)$(SHAREDLIBEXT)) - (cd libseq; $(MAKE) clean) - if [ $(LPORDDIR) != "" ] ; then \ - cd $(LPORDDIR); $(MAKE) realclean; \ - fi; - -diff --git a/PORD/lib/Makefile b/PORD/lib/Makefile ---- a/PORD/lib/Makefile -+++ b/PORD/lib/Makefile -@@ -19,14 +19,15 @@ OBJS = graph.o gbipart.o gbisect.o ddcre - # original SPACE package. - - .c.o: - $(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o - --libpord$(LIBEXT):$(OBJS) -+libpord$(PLAT)$(LIBEXT):$(OBJS) - $(AR)$@ $(OBJS) - $(RANLIB) $@ -+ $(CC) $(OBJS) $(CFLAGS) $(SHAREDFLAGS) -install_name $(PREFIX)/lib/libpord$(PLAT)$(SHAREDLIBEXT) -o libpord$(PLAT)$(SHAREDLIBEXT) - - clean: - rm -f *.o - - realclean: -- rm -f *.o libpord.a -+ rm -f *.o libpord$(LIBEXT) libpord$(SHAREDLIBEXT) -diff --git a/examples/Makefile b/examples/Makefile ---- a/examples/Makefile -+++ b/examples/Makefile -@@ -17,32 +17,32 @@ c: csimpletest - z: zsimpletest - - - include $(topdir)/Makefile.inc - --LIBMUMPS_COMMON = $(libdir)/libmumps_common$(PLAT)$(LIBEXT) -+LIBMUMPS_COMMON = $(libdir)/libmumps_common$(PLAT)$(SHAREDLIBEXT) - - --LIBSMUMPS = $(libdir)/libsmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) -+LIBSMUMPS = $(libdir)/libsmumps$(PLAT)$(SHAREDLIBEXT) $(LIBMUMPS_COMMON) - - ssimpletest: $(LIBSMUMPS) $$@.o - $(FL) -o $@ $(OPTL) ssimpletest.o $(LIBSMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - --LIBDMUMPS = $(libdir)/libdmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) -+LIBDMUMPS = $(libdir)/libdmumps$(PLAT)$(SHAREDLIBEXT) $(LIBMUMPS_COMMON) - - dsimpletest: $(LIBDMUMPS) $$@.o - $(FL) -o $@ $(OPTL) dsimpletest.o $(LIBDMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - --LIBCMUMPS = $(libdir)/libcmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) -+LIBCMUMPS = $(libdir)/libcmumps$(PLAT)$(SHAREDLIBEXT) $(LIBMUMPS_COMMON) - - csimpletest: $(LIBCMUMPS) $$@.o - $(FL) -o $@ $(OPTL) csimpletest.o $(LIBCMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - --LIBZMUMPS = $(libdir)/libzmumps$(PLAT)$(LIBEXT) $(LIBMUMPS_COMMON) -+LIBZMUMPS = $(libdir)/libzmumps$(PLAT)$(SHAREDLIBEXT) $(LIBMUMPS_COMMON) - - zsimpletest: $(LIBZMUMPS) $$@.o - $(FL) -o $@ $(OPTL) zsimpletest.o $(LIBZMUMPS) $(LORDERINGS) $(LIBS) $(LIBBLAS) $(LIBOTHERS) - - -@@ -55,23 +55,23 @@ c_example: $(LIBDMUMPS) $$@.o - $(FC) $(OPTF) $(INCS) -I. -I$(topdir)/include -c $*.F $(OUTF)$*.o - .c.o: - $(CC) $(OPTC) $(INCS) -I. -I$(topdir)/include -c $*.c $(OUTC)$*.o - - --$(libdir)/libsmumps$(PLAT)$(LIBEXT): -+$(libdir)/libsmumps$(PLAT)$(SHAREDLIBEXT): - @echo 'Error: you should build the library' $@ 'first' - exit -1 - --$(libdir)/libdmumps$(PLAT)$(LIBEXT): -+$(libdir)/libdmumps$(PLAT)$(SHAREDLIBEXT): - @echo 'Error: you should build the library' $@ 'first' - exit -1 - --$(libdir)/libcmumps$(PLAT)$(LIBEXT): -+$(libdir)/libcmumps$(PLAT)$(SHAREDLIBEXT): - @echo 'Error: you should build the library' $@ 'first' - exit -1 - --$(libdir)/libzmumps$(PLAT)$(LIBEXT): -+$(libdir)/libzmumps$(PLAT)$(SHAREDLIBEXT): - @echo 'Error: you should build the library' $@ 'first' - exit -1 - - $(LIBMUMPS_COMMON): - @echo 'Error: you should build the library' $@ 'first' -diff --git a/src/Makefile b/src/Makefile ---- a/src/Makefile -+++ b/src/Makefile -@@ -53,14 +53,16 @@ OBJS = $(ARITH)mumps_part1.o\ - - - $(libdir)/libmumps_common$(PLAT)$(LIBEXT): $(OBJS_COMMON) - $(AR)$@ $? - $(RANLIB) $@ -+ $(FC) $? $(OPTF) $(SHAREDFLAGS) $(LORDERINGS) $(SCALAP) $(libdir)/libpord$(SHAREDLIBEXT) -install_name $(PREFIX)/lib/libmumps_common$(PLAT)$(SHAREDLIBEXT) -o $(libdir)/libmumps_common$(PLAT)$(SHAREDLIBEXT) - - $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS) - $(AR)$@ $? - $(RANLIB) $@ -+ $(FC) $? $(OPTF) $(SHAREDFLAGS) $(LORDERINGS) $(SCALAP) $(libdir)/libpord$(SHAREDLIBEXT) $(OBJS_COMMON) -install_name $(PREFIX)/lib/lib$(ARITH)mumps$(PLAT)$(SHAREDLIBEXT) -o $(libdir)/lib$(ARITH)mumps$(PLAT)$(SHAREDLIBEXT) - - $(ARITH)mumps_load.o: $(ARITH)mumps_comm_buffer.o \ - $(ARITH)mumps_struc_def.o - - $(ARITH)mumps_ooc.o: $(ARITH)mumps_struc_def.o \
participants (1)
-
sean＠macports.org