Rebase scotch_esmumps.patch

This commit is contained in:
Sandro Mani 2015-03-14 20:55:00 +01:00
parent ad9e126248
commit 83fefc67de

View File

@ -1,12 +1,12 @@
diff -rupN scotch_6.0.3/src/esmumps/Makefile scotch_6.0.3-new/src/esmumps/Makefile
--- scotch_6.0.3/src/esmumps/Makefile 2012-12-01 15:29:29.000000000 +0100
+++ scotch_6.0.3-new/src/esmumps/Makefile 2014-12-01 23:29:01.951933733 +0100
diff -rupN scotch_6.0.4/src/esmumps/Makefile scotch_6.0.4-new/src/esmumps/Makefile
--- scotch_6.0.4/src/esmumps/Makefile 2015-03-14 00:32:06.000000000 +0100
+++ scotch_6.0.4-new/src/esmumps/Makefile 2015-03-14 20:53:15.577908208 +0100
@@ -59,7 +59,7 @@ scotch : clean
ptscotch : clean
$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps \
- libesmumps$(LIB) \
+ libptesmumps$(LIB) \
$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC="$(CCP)" SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps \
- libesmumps$(LIB) \
+ libptesmumps$(LIB) \
main_esmumps$(EXE)
install :
@ -19,9 +19,9 @@ diff -rupN scotch_6.0.3/src/esmumps/Makefile scotch_6.0.3-new/src/esmumps/Makefi
order$(OBJ) \
order_scotch_graph$(OBJ) \
dof$(OBJ) \
diff -rupN scotch_6.0.3/src/Makefile scotch_6.0.3-new/src/Makefile
--- scotch_6.0.3/src/Makefile 2014-09-28 20:48:05.000000000 +0200
+++ scotch_6.0.3-new/src/Makefile 2014-12-01 23:33:32.833263586 +0100
diff -rupN scotch_6.0.4/src/Makefile scotch_6.0.4-new/src/Makefile
--- scotch_6.0.4/src/Makefile 2014-10-02 17:31:36.000000000 +0200
+++ scotch_6.0.4-new/src/Makefile 2015-03-14 20:52:24.735897296 +0100
@@ -116,6 +116,8 @@ install : required $(bindir) $(includ
-$(CP) -f ../bin/d[agm]*$(EXE) $(bindir)
-$(CP) -f ../include/*scotch*.h $(includedir)