diff options
| author | Maurice Bremond <Maurice.Bremond@inria.fr> | 2020-02-13 11:50:55 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-02-14 23:01:47 +0100 |
| commit | 8cd2a395c7f2b4a607101ba2c9a3b8e47477e5a8 (patch) | |
| tree | 0689caa8660e72fe7cebc5a480eb1fd301e1fe30 /gnu/packages/patches | |
| parent | 459e0967705945bf6b5861598202aefef27451cd (diff) | |
| download | guix-8cd2a395c7f2b4a607101ba2c9a3b8e47477e5a8.tar guix-8cd2a395c7f2b4a607101ba2c9a3b8e47477e5a8.tar.gz | |
gnu: mumps: Change "5.1.2" to "5.2.1" in library file names.
* gnu/packages/patches/mumps-shared-libseq.patch,
gnu/packages/patches/mumps-shared-mumps.patch,
gnu/packages/patches/mumps-shared-pord.patch: Replace "5.1.2" with
"5.2.1" in file names.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/mumps-shared-libseq.patch | 2 | ||||
| -rw-r--r-- | gnu/packages/patches/mumps-shared-mumps.patch | 8 | ||||
| -rw-r--r-- | gnu/packages/patches/mumps-shared-pord.patch | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/patches/mumps-shared-libseq.patch b/gnu/packages/patches/mumps-shared-libseq.patch index feafcf123b..eccf528f7a 100644 --- a/gnu/packages/patches/mumps-shared-libseq.patch +++ b/gnu/packages/patches/mumps-shared-libseq.patch @@ -17,7 +17,7 @@ Index: mumps/libseq/Makefile + $(AR) $@ mpi.o mpic.o elapse.o $(RANLIB) $@ +libmpiseq$(PLAT).so: mpi.o mpic.o elapse.o -+ $(FC) -shared $^ -Wl,-soname,libmpiseq$(PLAT)-5.1.2.so -o libmpiseq$(PLAT)-5.1.2.so -Wl,-z,defs ++ $(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 diff --git a/gnu/packages/patches/mumps-shared-mumps.patch b/gnu/packages/patches/mumps-shared-mumps.patch index 9e2491f300..d94ccf6ce9 100644 --- a/gnu/packages/patches/mumps-shared-mumps.patch +++ b/gnu/packages/patches/mumps-shared-mumps.patch @@ -30,16 +30,16 @@ Index: mumps/src/Makefile -$(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.1.2.so -L$(libdir) $(LORDERINGS) -lpthread $(MPIFLIB) $(MPICLIB) $(LEXTRAS) -o $(libdir)/libmumps_common$(PLAT)-5.1.2.so -Wl,-z,defs -+ ln -s libmumps_common$(PLAT)-5.1.2.so $@ ++ $(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.1.2.so -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(MPIFLIB) $(LEXTRAS) $(LIBBLAS) $(SCALAP) $(LAPACK) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.1.2.so -Wl,-z,defs -+ ln -s lib$(ARITH)mumps$(PLAT)-5.1.2.so $@ ++ $(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 \ diff --git a/gnu/packages/patches/mumps-shared-pord.patch b/gnu/packages/patches/mumps-shared-pord.patch index 48062d4f89..d3915b0ad9 100644 --- a/gnu/packages/patches/mumps-shared-pord.patch +++ b/gnu/packages/patches/mumps-shared-pord.patch @@ -24,8 +24,8 @@ Index: mumps/PORD/lib/Makefile $(RANLIB) $@ +libpord$(PLAT).so: $(OBJS) -+ $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-5.1.2.so -o libpord$(PLAT)-5.1.2.so -Wl,-z,defs -+ ln -s libpord$(PLAT)-5.1.2.so $@ ++ $(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 |