diff options
Diffstat (limited to 'shared-mumps.patch')
| -rw-r--r-- | shared-mumps.patch | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/shared-mumps.patch b/shared-mumps.patch index 35432e7f9acf..d70b55feab81 100644 --- a/shared-mumps.patch +++ b/shared-mumps.patch @@ -2,22 +2,22 @@ Create a shared version of the MUMPS library. Index: mumps/src/Makefile =================================================================== ---- mumps.orig/src/Makefile -+++ mumps/src/Makefile -@@ -23,8 +23,10 @@ z: - +--- mumps.orig/src/Makefile 2020-10-01 23:59:29.359262672 +0800 ++++ mumps/src/Makefile 2020-10-02 00:36:33.502904903 +0800 +@@ -23,8 +23,10 @@ include $(topdir)/Makefile.inc --mumps_lib: $(libdir)/libmumps_common$(PLAT)$(LIBEXT) \ + mumps_lib: $(incdir)/mumps_int_def.h \ +- $(libdir)/libmumps_common$(PLAT)$(LIBEXT) \ - $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT) -+mumps_lib: $(libdir)/libmumps_common$(PLAT).a \ ++ $(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 = \ + # Build $(incdir)/mumps_int_def.h, needed by mumps_c_types.h + $(incdir)/mumps_int_def.h: build_mumps_int_def +@@ -188,14 +190,24 @@ $(ARITH)tools.o\ $(ARITH)type3_root.o @@ -30,34 +30,36 @@ 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.2.0.so -L$(libdir) $(LORDERINGS) -lpthread $(MPIFLIB) $(MPICLIB) -o $(libdir)/libmumps_common$(PLAT)-5.2.0.so -Wl,-z,defs -+ ln -s libmumps_common$(PLAT)-5.2.0.so $@ ++ $(FC) $(OPTL) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-$(SOVERSION).so -L$(libdir) $(LORDERINGS) -lpthread $(MPIFLIB) $(MPICLIB) -o $(libdir)/libmumps_common$(PLAT)-$(VERSION).so -Wl,-z,defs ++ ln -s libmumps_common$(PLAT)-$(VERSION).so $(libdir)/libmumps_common$(PLAT)-$(SOVERSION).so ++ ln -s libmumps_common$(PLAT)-$(VERSION).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.0.so -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(MPIFLIB) -lblas $(SCALAP) $(LAPACK) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.2.0.so -Wl,-z,defs -+ ln -s lib$(ARITH)mumps$(PLAT)-5.2.0.so $@ ++ $(FC) $(OPTL) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-$(SOVERSION).so -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(MPIFLIB) -lblas $(SCALAP) $(LAPACK) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-$(VERSION).so -Wl,-z,defs ++ ln -s lib$(ARITH)mumps$(PLAT)-$(VERSION).so $(libdir)/lib$(ARITH)mumps$(PLAT)-$(SOVERSION).so ++ ln -s lib$(ARITH)mumps$(PLAT)-$(VERSION).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_ + # i) arithmetic-dependent modules: + $(ARITH)ana_aux.o: $(ARITH)mumps_struc_def.o \ +@@ -405,13 +417,13 @@ .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 +- $(FC) $(OPTF) -I. -I../include $(INCS) $(IORDERINGSF) $(ORDERINGSF) -c $*.F $(OUTF)$*.o ++ $(FC) $(OPTF) -I. -I../include $(INCS) $(IORDERINGSF) $(ORDERINGSF) -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 +- $(CC) $(OPTC) -I../include $(INCS) $(CDEFS) $(IORDERINGSC) $(ORDERINGSC) -c $*.c $(OUTC)$*.o ++ $(CC) $(OPTC) -I../include $(INCS) $(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)$@ - + $(CC) $(OPTC) -I../include $(INCS) $(CDEFS) -DMUMPS_ARITH=MUMPS_ARITH_$(ARITH) \ +- $(IORDERINGSC) $(ORDERINGSC) -c mumps_c.c $(OUTC)$@ ++ $(IORDERINGSC) $(ORDERINGSC) -fPIC -c mumps_c.c $(OUTC)$@ clean: + $(RM) *.o *.mod $(incdir)/mumps_int_def.h |