mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-08 16:06:16 -05:00
8cd2a395c7
* 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>
77 lines
2.3 KiB
Diff
77 lines
2.3 KiB
Diff
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; \
|