summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-08-14 06:34:16 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-08-14 06:34:16 +0000
commit231bc1c50e868fb6d4b561f273678a714cfe8251 (patch)
treec9e74593576e4d71fbac564b03776b13015c12f6 /eclass
parentCleanup. (diff)
downloadgentoo-2-231bc1c50e868fb6d4b561f273678a714cfe8251.tar.gz
gentoo-2-231bc1c50e868fb6d4b561f273678a714cfe8251.tar.bz2
gentoo-2-231bc1c50e868fb6d4b561f273678a714cfe8251.zip
Fix disable-dependency-tracking passing. Fixes bug#372239.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/xorg-2.eclass12
2 files changed, 14 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 009a543285bc..aab7f305766f 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.368 2012/08/13 22:21:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.369 2012/08/14 06:34:16 scarabeus Exp $
+
+ 14 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> xorg-2.eclass:
+ Fix disable-dependency-tracking passing. Fixes bug#372239.
13 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> ruby-fakegem.eclass,
ruby-ng.eclass:
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 0883978eab92..a0ae12ea5f80 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.57 2012/06/11 13:02:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.58 2012/08/14 06:34:16 scarabeus Exp $
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
@@ -424,8 +424,16 @@ xorg-2_src_configure() {
fi
[[ -n "${FONT}" ]] && xorg-2_font_configure
+
+ # Check if package supports disabling of dep tracking
+ # Fixes warnings like:
+ # WARNING: unrecognized options: --disable-dependency-tracking
+ if grep -q -s "disable-depencency-tracking" ${ECONF_SOURCE:-.}/configure; then
+ local dep_track="--disable-dependency-tracking"
+ fi
+
local myeconfargs=(
- --disable-dependency-tracking
+ ${dep_track}
${FONT_OPTIONS}
"${xorgconfadd[@]}"
)