diff options
author | FELŠÖCI Marek <marek@felsoci.sk> | 2022-08-04 19:08:39 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-08-05 15:28:04 +0200 |
commit | b70d6ce6273a377963f706454640d88edbbd4208 (patch) | |
tree | f2c1f78a2d95b857fe441d6244ef6a32d5b74b6f /gnu/packages/patches | |
parent | 81faecf77ccc3f35f86ead3422bfcae467d93a95 (diff) |
gnu: mumps: Update to 5.5.1
* gnu/packages/maths.scm (mumps): Update to 5.5.1. Stop applying patches as the build configuration has been updated upstream. Allow for further optimized BLR compression by specifying the -DBLR_MT build option.
* gnu/packages/patches/mumps-build-parallelism.patch: File removed.
* gnu/packages/patches/mumps-shared-libseq.patch: File removed.
* gnu/packages/patches/mumps-shared-mumps.patch: File removed.
* gnu/packages/patches/mumps-shared-pord.patch: File removed.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/mumps-build-parallelism.patch | 13 | ||||
-rw-r--r-- | gnu/packages/patches/mumps-shared-libseq.patch | 42 | ||||
-rw-r--r-- | gnu/packages/patches/mumps-shared-mumps.patch | 63 | ||||
-rw-r--r-- | gnu/packages/patches/mumps-shared-pord.patch | 77 |
4 files changed, 0 insertions, 195 deletions
diff --git a/gnu/packages/patches/mumps-build-parallelism.patch b/gnu/packages/patches/mumps-build-parallelism.patch deleted file mode 100644 index 26dd330311..0000000000 --- a/gnu/packages/patches/mumps-build-parallelism.patch +++ /dev/null @@ -1,13 +0,0 @@ -Building sublibraries in parallel can lead to race conditions on the libseq -and lipord targets. - ---- MUMPS_5.0.0/Makefile.orig 2015-06-15 10:08:54.523146562 -0500 -+++ MUMPS_5.0.0/Makefile 2015-06-15 10:19:44.074367512 -0500 -@@ -11,6 +11,7 @@ - sexamples dexamples cexamples zexamples \ - mumps_lib requiredobj libseqneeded clean - -+.NOTPARALLEL: - alllib: c z s d - all: cexamples zexamples sexamples dexamples - diff --git a/gnu/packages/patches/mumps-shared-libseq.patch b/gnu/packages/patches/mumps-shared-libseq.patch deleted file mode 100644 index eccf528f7a..0000000000 --- a/gnu/packages/patches/mumps-shared-libseq.patch +++ /dev/null @@ -1,42 +0,0 @@ -Create a shared version of the sequential library, MUST BE LAST IN SERIES - -Index: mumps/libseq/Makefile -=================================================================== ---- mumps.orig/libseq/Makefile -+++ mumps/libseq/Makefile -@@ -8,15 +8,17 @@ all: libmpiseq - - include ../Makefile.inc - --libmpiseq: libmpiseq$(PLAT)$(LIBEXT) -+libmpiseq: libmpiseq$(PLAT).a libmpiseq$(PLAT).so - --libmpiseq$(PLAT)$(LIBEXT): mpi.o mpic.o elapse.o -- $(AR)$@ mpi.o mpic.o elapse.o -+libmpiseq$(PLAT).a: mpi.o mpic.o elapse.o -+ $(AR) $@ mpi.o mpic.o elapse.o - $(RANLIB) $@ -+libmpiseq$(PLAT).so: mpi.o mpic.o elapse.o -+ $(FC) -shared $^ -Wl,-soname,libmpiseq$(PLAT)-5.2.1.so -o libmpiseq$(PLAT)-5.2.1.so -Wl,-z,defs - .f.o: -- $(FC) $(OPTF) -c $*.f $(OUTF)$*.o -+ $(FC) $(OPTF) -fPIC -c $*.f $(OUTF)$*.o - .c.o: -- $(CC) $(OPTC) $(CDEFS) -I. -c $*.c $(OUTC)$*.o -+ $(CC) $(OPTC) $(CDEFS) -I. -fPIC -c $*.c $(OUTC)$*.o - - clean: -- $(RM) *.o *$(LIBEXT) -+ $(RM) *.o *.a *.so -Index: mumps/Makefile -=================================================================== ---- mumps.orig/Makefile -+++ mumps/Makefile -@@ -60,6 +60,7 @@ requiredobj: Makefile.inc $(LIBSEQNEEDED - - libseqneeded: - (cd libseq; $(MAKE)) -+ cp libseq/lib* $(libdir) - - # Build the libpord.a library and copy it into $(topdir)/lib - $(libdir)/libpord$(PLAT).a: diff --git a/gnu/packages/patches/mumps-shared-mumps.patch b/gnu/packages/patches/mumps-shared-mumps.patch deleted file mode 100644 index d94ccf6ce9..0000000000 --- a/gnu/packages/patches/mumps-shared-mumps.patch +++ /dev/null @@ -1,63 +0,0 @@ -Create a shared version of the MUMPS library. - -Index: mumps/src/Makefile -=================================================================== ---- mumps.orig/src/Makefile -+++ mumps/src/Makefile -@@ -23,8 +23,10 @@ z: - - include $(topdir)/Makefile.inc - --mumps_lib: $(libdir)/libmumps_common$(PLAT)$(LIBEXT) \ -- $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT) -+mumps_lib: $(libdir)/libmumps_common$(PLAT).a \ -+ $(libdir)/libmumps_common$(PLAT).so \ -+ $(libdir)/lib$(ARITH)mumps$(PLAT).a \ -+ $(libdir)/lib$(ARITH)mumps$(PLAT).so - - OBJS_COMMON_MOD = \ - lr_common.o \ -@@ -167,14 +169,22 @@ OBJS_OTHER = \ - $(ARITH)tools.o\ - $(ARITH)type3_root.o - --$(libdir)/libmumps_common$(PLAT)$(LIBEXT): $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) -- $(AR)$@ $? -+$(libdir)/libmumps_common$(PLAT).a: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) -+ $(AR) $@ $? - $(RANLIB) $@ - --$(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS_MOD) $(OBJS_OTHER) -- $(AR)$@ $? -+$(libdir)/libmumps_common$(PLAT).so: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) -+ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.2.1.so -L$(libdir) $(LORDERINGS) -lpthread $(MPIFLIB) $(MPICLIB) $(LEXTRAS) -o $(libdir)/libmumps_common$(PLAT)-5.2.1.so -Wl,-z,defs -+ ln -s libmumps_common$(PLAT)-5.2.1.so $@ -+ -+$(libdir)/lib$(ARITH)mumps$(PLAT).a: $(OBJS_MOD) $(OBJS_OTHER) -+ $(AR) $@ $? - $(RANLIB) $@ - -+$(libdir)/lib$(ARITH)mumps$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER) -+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.2.1.so -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(MPIFLIB) $(LEXTRAS) $(LIBBLAS) $(SCALAP) $(LAPACK) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.2.1.so -Wl,-z,defs -+ ln -s lib$(ARITH)mumps$(PLAT)-5.2.1.so $@ -+ - # Dependencies between modules: - $(ARITH)mumps_load.o: $(ARITH)mumps_comm_buffer.o \ - $(ARITH)mumps_struc_def.o \ -@@ -290,13 +300,13 @@ $(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 -fPIC -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) -fPIC -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 -fPIC -c mumps_c.c $(OUTC)$@ - - - clean: diff --git a/gnu/packages/patches/mumps-shared-pord.patch b/gnu/packages/patches/mumps-shared-pord.patch deleted file mode 100644 index d3915b0ad9..0000000000 --- a/gnu/packages/patches/mumps-shared-pord.patch +++ /dev/null @@ -1,77 +0,0 @@ -Create static and shared versions of the PORD library. - -Index: mumps/PORD/lib/Makefile -=================================================================== ---- mumps.orig/PORD/lib/Makefile -+++ mumps/PORD/lib/Makefile -@@ -9,7 +9,7 @@ - - INCLUDES = -I../include - --COPTIONS = $(INCLUDES) $(CFLAGS) $(OPTFLAGS) -+COPTIONS = $(INCLUDES) $(CFLAGS) $(OPTFLAGS) -fPIC - - OBJS = graph.o gbipart.o gbisect.o ddcreate.o ddbisect.o nestdiss.o \ - multisector.o gelim.o bucket.o tree.o \ -@@ -24,12 +24,16 @@ OBJS = graph.o gbipart.o gbisect.o ddcre - .c.o: - $(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o - --libpord$(LIBEXT):$(OBJS) -- $(AR)$@ $(OBJS) -+libpord$(PLAT).a:$(OBJS) -+ $(AR) $@ $(OBJS) - $(RANLIB) $@ - -+libpord$(PLAT).so: $(OBJS) -+ $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-5.2.1.so -o libpord$(PLAT)-5.2.1.so -Wl,-z,defs -+ ln -s libpord$(PLAT)-5.2.1.so $@ -+ - clean: - rm -f *.o - - realclean: -- rm -f *.o libpord.a -+ rm -f *.o libpord*.a *.so -Index: mumps/Makefile -=================================================================== ---- mumps.orig/Makefile -+++ mumps/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).a $(libdir)/libpord$(PLAT).so - - # dummy MPI library (sequential version) - -@@ -62,19 +62,25 @@ libseqneeded: - (cd libseq; $(MAKE)) - - # Build the libpord.a library and copy it into $(topdir)/lib --$(libdir)/libpord$(PLAT)$(LIBEXT): -+$(libdir)/libpord$(PLAT).a: - if [ "$(LPORDDIR)" != "" ] ; then \ - cd $(LPORDDIR); \ - $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT=$(LIBEXT); \ - fi; - if [ "$(LPORDDIR)" != "" ] ; then \ -- cp $(LPORDDIR)/libpord$(LIBEXT) $@; \ -+ cp $(LPORDDIR)/libpord$(PLAT).a $@; \ - fi; - -+$(libdir)/libpord$(PLAT).so: -+ if [ "$(LPORDDIR)" != "" ] ; then \ -+ cd $(LPORDDIR); make CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" ARFUNCT= RANLIB="$(RANLIB)" libpord$(PLAT).so; fi; -+ if [ "$(LPORDDIR)" != "" ] ; then \ -+ cp -a $(LPORDDIR)/libpord*.so lib/; fi; -+ - clean: - (cd src; $(MAKE) clean) - (cd examples; $(MAKE) clean) -- (cd $(libdir); $(RM) *$(PLAT)$(LIBEXT)) -+ (cd $(libdir); $(RM) *$(PLAT).a *$(PLAT).so) - (cd libseq; $(MAKE) clean) - if [ "$(LPORDDIR)" != "" ] ; then \ - cd $(LPORDDIR); $(MAKE) realclean; \ |