summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-12-08 18:50:44 +0000
committerMike Frysinger <vapier@gentoo.org>2007-12-08 18:50:44 +0000
commitfb690de657f5d32c12a0b69045ce87cc42149636 (patch)
tree72178969eb04718db02e3a12107715585e654cbd /dev-libs/DirectFB
parentamd64 stable wrt #201707 (diff)
downloadgentoo-2-fb690de657f5d32c12a0b69045ce87cc42149636.tar.gz
gentoo-2-fb690de657f5d32c12a0b69045ce87cc42149636.tar.bz2
gentoo-2-fb690de657f5d32c12a0b69045ce87cc42149636.zip
Delete /usr/X11R6/ flags from build #201626 by Arfrever Frehtes Taifersar Arahesis.
(Portage version: 2.1.4_rc4)
Diffstat (limited to 'dev-libs/DirectFB')
-rw-r--r--dev-libs/DirectFB/ChangeLog6
-rw-r--r--dev-libs/DirectFB/DirectFB-1.1.0.ebuild15
2 files changed, 19 insertions, 2 deletions
diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index a1ee2c530b3d..5013de29f7e5 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/DirectFB
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.65 2007/12/02 22:22:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.66 2007/12/08 18:50:44 vapier Exp $
+
+ 08 Dec 2007; Mike Frysinger <vapier@gentoo.org> DirectFB-1.1.0.ebuild:
+ Delete /usr/X11R6/ flags from build #201626 by Arfrever Frehtes Taifersar
+ Arahesis.
*DirectFB-1.1.0 (02 Dec 2007)
diff --git a/dev-libs/DirectFB/DirectFB-1.1.0.ebuild b/dev-libs/DirectFB/DirectFB-1.1.0.ebuild
index 70a9b7706db5..7f471ee1b67c 100644
--- a/dev-libs/DirectFB/DirectFB-1.1.0.ebuild
+++ b/dev-libs/DirectFB/DirectFB-1.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.1.0.ebuild,v 1.1 2007/12/02 22:22:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.1.0.ebuild,v 1.2 2007/12/08 18:50:44 vapier Exp $
inherit eutils toolchain-funcs
@@ -48,6 +48,19 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-0.9.24-CFLAGS.patch
epatch "${FILESDIR}"/${P}-headers.patch
epatch "${FILESDIR}"/${P}-pkgconfig.patch
+
+ # This is only a partial fix to the X11 order issue #201626. It's just
+ # the only part we need in order to make the issue go away. Upstream
+ # bug tracker is currently broken, so list things to do here:
+ # configure.in:
+ # - only add -I/usr/X11R6/include to X11_CFLAGS as needed
+ # - only add -L/usr/X11R6/lib to X11_LIBS as needed
+ # systems/x11/Makefile.am:
+ # - add $(X11_LIBS) to end of _LIBADD variables
+ sed -i \
+ -e '/X11_LIBS/s:-L/usr/X11R6/lib::' \
+ -e '/CFLAGS/s:-I/usr/X11R6/include::' \
+ configure
}
src_compile() {