scotch/scotch-ldflags.patch
2019-05-20 14:12:39 +02:00

69 lines
2.8 KiB
Diff

diff -rupN scotch_6.0.6/src/esmumps/Makefile scotch_6.0.6-new/src/esmumps/Makefile
--- scotch_6.0.6/src/esmumps/Makefile 2018-07-14 17:24:49.000000000 +0200
+++ scotch_6.0.6-new/src/esmumps/Makefile 2019-05-20 13:38:16.109735236 +0200
@@ -148,7 +148,7 @@ libesmumps$(LIB) : graph_graph$(OBJ)
esmumps$(OBJ) \
esmumps_f$(OBJ) \
esmumps_strats$(OBJ)
- $(AR) $(ARFLAGS) $(@) $(?)
+ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS) -L ../libscotch -lscotch
-$(RANLIB) $(@)
main_esmumps$(EXE) : main_esmumps.c \
diff -rupN scotch_6.0.6/src/libscotch/Makefile scotch_6.0.6-new/src/libscotch/Makefile
--- scotch_6.0.6/src/libscotch/Makefile 2018-07-14 17:24:49.000000000 +0200
+++ scotch_6.0.6-new/src/libscotch/Makefile 2019-05-20 13:38:16.109735236 +0200
@@ -3064,26 +3064,26 @@ ptscotchf.h : ptdummysizes$(EXE) \
library_pt_f.h
./ptdummysizes$(EXE) "-s$(SCOTCH_NAME_SUFFIX)" library_pt_f.h ptscotchf.h
-libscotch$(LIB) : $(LIBSCOTCHDEPS)
- $(AR) $(ARFLAGS) $(@) $(?)
+libscotch$(LIB) : $(LIBSCOTCHDEPS) libscotcherr$(LIB)
+ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS) -L . -lscotcherr
-$(RANLIB) $(@)
libscotcherr$(LIB) : library_error$(OBJ)
- $(AR) $(ARFLAGS) $(@) $(?)
+ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS)
-$(RANLIB) $(@)
libscotcherrexit$(LIB) : library_error_exit$(OBJ)
- $(AR) $(ARFLAGS) $(@) $(?)
+ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS)
-$(RANLIB) $(@)
-libptscotch$(LIB) : $(LIBPTSCOTCHDEPS)
- $(AR) $(ARFLAGS) $(@) $(?)
+libptscotch$(LIB) : $(LIBPTSCOTCHDEPS) libscotch$(LIB)
+ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS) -L . -lscotch
-$(RANLIB) $(@)
libptscotcherr$(LIB) : library_error_pt$(OBJ)
- $(AR) $(ARFLAGS) $(@) $(?)
+ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS)
-$(RANLIB) $(@)
libptscotcherrexit$(LIB) : library_error_exit_pt$(OBJ)
- $(AR) $(ARFLAGS) $(@) $(?)
+ $(AR) $(ARFLAGS) $(@) $(?) $(LDFLAGS)
-$(RANLIB) $(@)
diff -rupN scotch_6.0.6/src/libscotchmetis/Makefile scotch_6.0.6-new/src/libscotchmetis/Makefile
--- scotch_6.0.6/src/libscotchmetis/Makefile 2018-07-14 17:24:49.000000000 +0200
+++ scotch_6.0.6-new/src/libscotchmetis/Makefile 2019-05-20 13:38:16.110735234 +0200
@@ -139,12 +139,12 @@ libptscotchparmetis$(LIB) : parmetis_dgr
parmetis_dgraph_order_f$(OBJ) \
parmetis_dgraph_part$(OBJ) \
parmetis_dgraph_part_f$(OBJ)
- $(AR) $(ARFLAGS) $(@) $(^)
+ $(AR) $(ARFLAGS) $(@) $(^) $(LDFLAGS) -L ../libscotch -lptscotch
-$(RANLIB) $(@)
libscotchmetis$(LIB) : metis_graph_order$(OBJ) \
metis_graph_order_f$(OBJ) \
metis_graph_part$(OBJ) \
metis_graph_part_f$(OBJ)
- $(AR) $(ARFLAGS) $(@) $(^)
+ $(AR) $(ARFLAGS) $(@) $(^) $(LDFLAGS) -L ../libscotch -lscotch
-$(RANLIB) $(@)