summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-02-24 09:45:27 +0000
committerMike Frysinger <vapier@gentoo.org>2008-02-24 09:45:27 +0000
commit9272b3a24a861c29bd2c164a862174822881b37f (patch)
tree74bd36822f8678be82adc690e5b14731635a9748 /dev-games/ode
parentstable x86, bug 211023 (diff)
downloadgentoo-2-9272b3a24a861c29bd2c164a862174822881b37f.tar.gz
gentoo-2-9272b3a24a861c29bd2c164a862174822881b37f.tar.bz2
gentoo-2-9272b3a24a861c29bd2c164a862174822881b37f.zip
Dont add empty -I/-L flags for X #152408.
(Portage version: 2.2_pre2)
Diffstat (limited to 'dev-games/ode')
-rw-r--r--dev-games/ode/ChangeLog8
-rw-r--r--dev-games/ode/files/ode-0.9-x-flags.patch19
-rw-r--r--dev-games/ode/ode-0.9.ebuild5
3 files changed, 28 insertions, 4 deletions
diff --git a/dev-games/ode/ChangeLog b/dev-games/ode/ChangeLog
index 036789cae821..55d6a1f22af5 100644
--- a/dev-games/ode/ChangeLog
+++ b/dev-games/ode/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/ode
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.45 2007/10/19 17:07:18 mr_bones_ Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.46 2008/02/24 09:45:27 vapier Exp $
+
+ 24 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+ +files/ode-0.9-x-flags.patch, ode-0.9.ebuild:
+ Dont add empty -I/-L flags for X #152408.
*ode-0.9 (19 Oct 2007)
diff --git a/dev-games/ode/files/ode-0.9-x-flags.patch b/dev-games/ode/files/ode-0.9-x-flags.patch
new file mode 100644
index 000000000000..75aa4c4a51c9
--- /dev/null
+++ b/dev-games/ode/files/ode-0.9-x-flags.patch
@@ -0,0 +1,19 @@
+don't go adding emtpy -I/-L flags. this has been fixed upstream.
+
+http://bugs.gentoo.org/152408
+
+--- configure.in
++++ configure.in
+@@ -10207,10 +10207,10 @@
+
+ dnl Check for AC_PATH_X variables
+-if test "X$x_includes" != "XNONE"; then
++if test "X$x_includes" != "XNONE" -a "X$x_includes" != "X"; then
+ CFLAGS="$CFLAGS -I$x_includes"
+ CXXFLAGS="$CXXFLAGS -I$x_includes"
+ fi
+-if test "X$x_libraries" != "XNONE"; then
++if test "X$x_libraries" != "XNONE" -a "X$x_libraries" != "X"; then
+ CFLAGS="$CFLAGS -L$x_libraries"
+ CXXFLAGS="$CXXFLAGS -L$x_libraries"
+ fi
diff --git a/dev-games/ode/ode-0.9.ebuild b/dev-games/ode/ode-0.9.ebuild
index be133c5ecb04..3ab1a9830006 100644
--- a/dev-games/ode/ode-0.9.ebuild
+++ b/dev-games/ode/ode-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.9.ebuild,v 1.1 2007/10/19 17:07:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.9.ebuild,v 1.2 2008/02/24 09:45:27 vapier Exp $
inherit eutils autotools
@@ -30,6 +30,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${P}-flags.patch
+ epatch "${FILESDIR}"/${P}-x-flags.patch
eautoreconf
sed -i \