summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-05-21 14:00:06 +0000
committerJustin Lecher <jlec@gentoo.org>2010-05-21 14:00:06 +0000
commit071313e5ef9520a14edf639f381f319392c2f2cc (patch)
tree41d313d0c98c93eba2cdd38117dd926903069624 /sci-libs/gerris/files
parentx86 stable wrt bug #319265 (diff)
downloadgentoo-2-071313e5ef9520a14edf639f381f319392c2f2cc.tar.gz
gentoo-2-071313e5ef9520a14edf639f381f319392c2f2cc.tar.bz2
gentoo-2-071313e5ef9520a14edf639f381f319392c2f2cc.zip
Version Bump, remove python which is only needed for the restricted test
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/gerris/files')
-rw-r--r--sci-libs/gerris/files/gerris-20100519-autotools.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/sci-libs/gerris/files/gerris-20100519-autotools.patch b/sci-libs/gerris/files/gerris-20100519-autotools.patch
new file mode 100644
index 000000000000..2bab3f3a2d07
--- /dev/null
+++ b/sci-libs/gerris/files/gerris-20100519-autotools.patch
@@ -0,0 +1,47 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8b07f68..678ebbd 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,9 +2,7 @@
+
+ AUTOMAKE_OPTIONS = 1.6
+
+-AM_CPPFLAGS = -DGFS_MODULES_DIR=\"$(libdir)/gerris\"
+-
+-INCLUDES = -I$(top_srcdir) -I$(includedir) \
++AM_CPPFLAGS = -DGFS_MODULES_DIR=\"$(libdir)/gerris\" \
+ -DG_LOG_DOMAIN=\"Gfs\" $(GTS_CFLAGS)
+
+ bin_SCRIPTS = gfs-config
+@@ -114,12 +112,14 @@ libgfs3D_la_LDFLAGS = $(NO_UNDEFINED)\
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)\
+ -release $(LT_RELEASE) -export-dynamic
+ libgfs3D_la_SOURCES = $(SRC)
++libgfs3D_la_LIBADD = $(GTS_LIBS)
+
+ libgfs2D_la_LDFLAGS = $(NO_UNDEFINED)\
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)\
+ -release $(LT_RELEASE) -export-dynamic
+ libgfs2D_la_SOURCES = $(SRC)
+-libgfs2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
++libgfs2D_la_CPPFLAGS = $(AM_CPPFLAGS) -DFTT_2D=1
++libgfs2D_la_LIBADD = $(GTS_LIBS)
+
+ CLEANFILES = $(BUILT_SOURCES)
+
+@@ -131,12 +131,12 @@ EXTRA_DIST = \
+ bin_PROGRAMS = gerris2D gerris3D
+
+ gerris2D_SOURCES = gerris.c
+-gerris2D_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
+-gerris2D_LDADD = $(GFS2D_LIBS)
++gerris2D_CPPFLAGS = $(AM_CPPFLAGS) -DFTT_2D=1
++gerris2D_LDADD = libgfs2D.la
+ gerris2D_DEPENDENCIES = libgfs2D.la
+
+ gerris3D_SOURCES = gerris.c
+-gerris3D_LDADD = $(GFS3D_LIBS)
++gerris3D_LDADD = libgfs3D.la
+ gerris3D_DEPENDENCIES = libgfs3D.la
+
+ if DARCS_CONTROLLED