* [gentoo-commits] gentoo-x86 commit in sci-libs/scotch/files: scotch-6.0.0-as-needed.patch
@ 2013-02-07 7:29 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2013-02-07 7:29 UTC (permalink / raw
To: gentoo-commits
bicatali 13/02/07 07:29:28
Added: scotch-6.0.0-as-needed.patch
Log:
Version bump
(Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Revision Changes Path
1.1 sci-libs/scotch/files/scotch-6.0.0-as-needed.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scotch/files/scotch-6.0.0-as-needed.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scotch/files/scotch-6.0.0-as-needed.patch?rev=1.1&content-type=text/plain
Index: scotch-6.0.0-as-needed.patch
===================================================================
diff -Nur src.orig/check/Makefile src/check/Makefile
--- src.orig/check/Makefile 2013-02-06 22:03:30.487658815 -0800
+++ src/check/Makefile 2013-02-06 23:02:59.724078652 -0800
@@ -48,7 +48,7 @@
$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(SCOTCHINCLUDEDIR) -c $(<) -o $(@)
%$(EXE) : %.c
- $(CC) $(CFLAGS) -I$(SCOTCHINCLUDEDIR) -L$(SCOTCHLIBDIR) $(<) -o $(@) $(SCOTCHLIBS) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(SCOTCHINCLUDEDIR) -L$(SCOTCHLIBDIR) $(<) $(SCOTCHLIBS) $(LIBS) -o $(@)
##
## Project rules.
diff -Nur src.orig/esmumps/Makefile src/esmumps/Makefile
--- src.orig/esmumps/Makefile 2013-02-06 22:03:30.486658809 -0800
+++ src/esmumps/Makefile 2013-02-06 23:03:17.826171776 -0800
@@ -44,7 +44,7 @@
$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@)
%$(EXE) : %.c
- $(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit -lm
+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
##
## Project rules.
@@ -57,7 +57,7 @@
libesmumps$(LIB) \
main_esmumps$(EXE)
-ptscotch : clean
+ptscotch : clean common.h
$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps \
libesmumps$(LIB) \
main_esmumps$(EXE)
@@ -142,7 +142,7 @@
common.h \
esmumps.h
-libesmumps$(LIB) : graph_graph$(OBJ) \
+lib$(ESMUMPSLIB)$(LIB) : graph_graph$(OBJ) \
order$(OBJ) \
order_scotch_graph$(OBJ) \
dof$(OBJ) \
diff -Nur src.orig/libscotch/Makefile src/libscotch/Makefile
--- src.orig/libscotch/Makefile 2013-02-06 22:03:30.494658850 -0800
+++ src/libscotch/Makefile 2013-02-06 23:03:59.702387230 -0800
@@ -43,7 +43,7 @@
$(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@)
%$(EXE) : %.c
- $(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@)
##
## Project rules.
@@ -2908,14 +2908,14 @@
mapping.h \
order.h \
parser.h
- $(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
+ $(CCD) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@)
ptdummysizes$(EXE) : dummysizes.c \
module.h \
common.h \
dgraph.h \
dorder.h
- $(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
+ $(CCD) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@)
scotch.h : dummysizes$(EXE) \
library.h
diff -Nur src.orig/libscotchmetis/Makefile src/libscotchmetis/Makefile
--- src.orig/libscotchmetis/Makefile 2013-02-06 22:03:30.477658764 -0800
+++ src/libscotchmetis/Makefile 2013-02-06 22:19:34.684626271 -0800
@@ -44,7 +44,7 @@
$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
%$(EXE) : %.c
- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -o $(@)
##
## Project rules.
diff -Nur src.orig/scotch/Makefile src/scotch/Makefile
--- src.orig/scotch/Makefile 2013-02-06 22:03:30.500658881 -0800
+++ src/scotch/Makefile 2013-02-06 23:04:46.244626691 -0800
@@ -41,13 +41,13 @@
include ../Makefile.inc
%$(EXE) : %$(OBJ)
- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
%$(OBJ) : %.c
$(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
%$(EXE) : %.c
- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -lscotch -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
##
## Project rules.
@@ -205,7 +205,7 @@
$(libdir)/libptscotch$(LIB) \
$(libdir)/libptscotcherrexit$(LIB) \
dgmap.h
- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -lptscotch -lscotch -lptscotcherrexit $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -lptscotch -lscotch -lptscotcherrexit $(LIBS) -o $(@)
dgscat$(EXE) : dgscat.c \
../libscotch/module.h \
@@ -315,7 +315,7 @@
gout_o.c \
$(includedir)/scotch.h \
$(libdir)/libscotch$(LIB)
- $(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@)
gpart$(EXE) : gmap.c \
../libscotch/module.h \
@@ -324,7 +324,7 @@
$(libdir)/libscotch$(LIB) \
$(libdir)/libscotcherrexit$(LIB) \
gmap.h
- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@)
gscat$(EXE) : gscat.c \
../libscotch/module.h \
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/scotch/files: scotch-6.0.0-as-needed.patch
@ 2013-02-07 17:30 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2013-02-07 17:30 UTC (permalink / raw
To: gentoo-commits
bicatali 13/02/07 17:30:59
Modified: scotch-6.0.0-as-needed.patch
Log:
Fixed for parallel compiling when mpi flag is set
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Revision Changes Path
1.2 sci-libs/scotch/files/scotch-6.0.0-as-needed.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scotch/files/scotch-6.0.0-as-needed.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scotch/files/scotch-6.0.0-as-needed.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scotch/files/scotch-6.0.0-as-needed.patch?r1=1.1&r2=1.2
Index: scotch-6.0.0-as-needed.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/scotch/files/scotch-6.0.0-as-needed.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scotch-6.0.0-as-needed.patch 7 Feb 2013 07:29:28 -0000 1.1
+++ scotch-6.0.0-as-needed.patch 7 Feb 2013 17:30:59 -0000 1.2
@@ -1,6 +1,6 @@
diff -Nur src.orig/check/Makefile src/check/Makefile
---- src.orig/check/Makefile 2013-02-06 22:03:30.487658815 -0800
-+++ src/check/Makefile 2013-02-06 23:02:59.724078652 -0800
+--- src.orig/check/Makefile 2013-02-07 17:27:00.000000000 +0000
++++ src/check/Makefile 2013-02-07 17:27:21.000000000 +0000
@@ -48,7 +48,7 @@
$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(SCOTCHINCLUDEDIR) -c $(<) -o $(@)
@@ -11,8 +11,8 @@
##
## Project rules.
diff -Nur src.orig/esmumps/Makefile src/esmumps/Makefile
---- src.orig/esmumps/Makefile 2013-02-06 22:03:30.486658809 -0800
-+++ src/esmumps/Makefile 2013-02-06 23:03:17.826171776 -0800
+--- src.orig/esmumps/Makefile 2013-02-07 17:27:00.000000000 +0000
++++ src/esmumps/Makefile 2013-02-07 17:28:11.000000000 +0000
@@ -44,7 +44,7 @@
$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@)
@@ -31,18 +31,17 @@
$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps \
libesmumps$(LIB) \
main_esmumps$(EXE)
-@@ -142,7 +142,7 @@
- common.h \
- esmumps.h
-
--libesmumps$(LIB) : graph_graph$(OBJ) \
-+lib$(ESMUMPSLIB)$(LIB) : graph_graph$(OBJ) \
- order$(OBJ) \
- order_scotch_graph$(OBJ) \
- dof$(OBJ) \
+@@ -160,6 +160,6 @@
+ order.h \
+ symbol.h \
+ esmumps.h \
+- lib$(ESMUMPSLIB)$(LIB) \
++ libesmumps$(LIB) \
+ $(libdir)/lib$(SCOTCHLIB)$(LIB) \
+ $(libdir)/lib$(SCOTCHLIB)errexit$(LIB)
diff -Nur src.orig/libscotch/Makefile src/libscotch/Makefile
---- src.orig/libscotch/Makefile 2013-02-06 22:03:30.494658850 -0800
-+++ src/libscotch/Makefile 2013-02-06 23:03:59.702387230 -0800
+--- src.orig/libscotch/Makefile 2013-02-07 17:27:00.000000000 +0000
++++ src/libscotch/Makefile 2013-02-07 17:27:21.000000000 +0000
@@ -43,7 +43,7 @@
$(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@)
@@ -70,8 +69,8 @@
scotch.h : dummysizes$(EXE) \
library.h
diff -Nur src.orig/libscotchmetis/Makefile src/libscotchmetis/Makefile
---- src.orig/libscotchmetis/Makefile 2013-02-06 22:03:30.477658764 -0800
-+++ src/libscotchmetis/Makefile 2013-02-06 22:19:34.684626271 -0800
+--- src.orig/libscotchmetis/Makefile 2013-02-07 17:27:00.000000000 +0000
++++ src/libscotchmetis/Makefile 2013-02-07 17:27:21.000000000 +0000
@@ -44,7 +44,7 @@
$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
@@ -82,8 +81,8 @@
##
## Project rules.
diff -Nur src.orig/scotch/Makefile src/scotch/Makefile
---- src.orig/scotch/Makefile 2013-02-06 22:03:30.500658881 -0800
-+++ src/scotch/Makefile 2013-02-06 23:04:46.244626691 -0800
+--- src.orig/scotch/Makefile 2013-02-07 17:27:00.000000000 +0000
++++ src/scotch/Makefile 2013-02-07 17:27:21.000000000 +0000
@@ -41,13 +41,13 @@
include ../Makefile.inc
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-07 17:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-07 17:30 [gentoo-commits] gentoo-x86 commit in sci-libs/scotch/files: scotch-6.0.0-as-needed.patch Sebastien Fabbro (bicatali)
-- strict thread matches above, loose matches on Subject: below --
2013-02-07 7:29 Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox