summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2012-09-03 19:30:21 +0000
committerJulian Ospald <hasufell@gentoo.org>2012-09-03 19:30:21 +0000
commit4e55f0e69aecd25b62cf28f2f25877f2888dcc93 (patch)
tree77f91db3f52247617d50cb2e3e6a54b9e7a06488 /games-simulation/cannonsmash/files
parentrespect cflags wrt #430080 (diff)
downloadgentoo-2-4e55f0e69aecd25b62cf28f2f25877f2888dcc93.tar.gz
gentoo-2-4e55f0e69aecd25b62cf28f2f25877f2888dcc93.tar.bz2
gentoo-2-4e55f0e69aecd25b62cf28f2f25877f2888dcc93.zip
respect flags wrt #427788
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'games-simulation/cannonsmash/files')
-rw-r--r--games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch21
-rw-r--r--games-simulation/cannonsmash/files/cannonsmash-0.6.6-ldflags.patch11
2 files changed, 21 insertions, 11 deletions
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
new file mode 100644
index 000000000000..85612b929c59
--- /dev/null
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
@@ -0,0 +1,21 @@
+--- configure.old 2010-10-18 15:05:02.000000000 +0200
++++ configure 2010-10-18 15:05:31.000000000 +0200
+@@ -5516,12 +5516,12 @@
+
+
+ if test "x$x_includes" != "x"; then
+- CFLAGS="-I $x_includes"
+-else
+- CFLAGS=""
+-fi
+-LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
+-CXXFLAGS="$CFLAGS -Wall"
++ CFLAGS="${CFLAGS} -I $x_includes"
++else
++ CFLAGS="${CFLAGS}"
++fi
++LDFLAGS="${LDFLAGS} -L/usr/local/lib -L$x_libraries -L$libdir"
++CXXFLAGS="${CXXFLAGS} -Wall"
+
+
+ echo "$as_me:$LINENO: checking for main in -lXmu" >&5
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-ldflags.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-ldflags.patch
deleted file mode 100644
index ad6168a463ed..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old 2010-10-18 15:05:02.000000000 +0200
-+++ configure 2010-10-18 15:05:31.000000000 +0200
-@@ -5520,7 +5520,7 @@
- else
- CFLAGS=""
- fi
--LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
-+LDFLAGS="${LDFLAGS} -L/usr/local/lib -L$x_libraries -L$libdir"
- CXXFLAGS="$CFLAGS -Wall"
-
-