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; \ sg=1'>Expand)Author 2019-11-27daemon: GC remove-unused-links phase uses 'statx' when available....Ludovic Courtès 2019-11-13daemon: Don't include <linux/fs.h>....Ludovic Courtès 2019-09-08daemon: Run 'guix substitute' directly and assume a single substituter....Ludovic Courtès 2019-09-08daemon: Run 'guix offload' directly....Ludovic Courtès 2019-09-08daemon: Run 'guix perform-download' directly....Ludovic Courtès 2019-09-08daemon: Run 'guix authenticate' directly....Ludovic Courtès 2019-09-08daemon: Invoke 'guix gc --list-busy' instead of 'list-runtime-roots'....Ludovic Courtès 2019-05-01build: Change default substitute server to "ci.guix.gnu.org"....Ludovic Courtès