summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-04-09 09:15:51 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-04-09 09:15:51 +0000
commit25f3c2c0304e3de212b2508d1f2ceda13ca9b7e0 (patch)
tree042ccba2a116cadefd680522d39ecaf5394f9ec2 /eclass/xfconf.eclass
parentVersion bump. (diff)
downloadhistorical-25f3c2c0304e3de212b2508d1f2ceda13ca9b7e0.tar.gz
historical-25f3c2c0304e3de212b2508d1f2ceda13ca9b7e0.tar.bz2
historical-25f3c2c0304e3de212b2508d1f2ceda13ca9b7e0.zip
Fix xfconf.eclass xfconf_use_debug logic so it'll be compatible with 9999 versions in the overlay. Yes, we really don't want --disable-debug EVER and we WANT --enable-debug=minimum by default. It's the upstream default too.
Diffstat (limited to 'eclass/xfconf.eclass')
-rw-r--r--eclass/xfconf.eclass11
1 files changed, 5 insertions, 6 deletions
diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass
index 04cbf654ff68..3ca809826b15 100644
--- a/eclass/xfconf.eclass
+++ b/eclass/xfconf.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.24 2011/02/14 19:52:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.25 2011/04/09 09:15:51 ssuominen Exp $
# @ECLASS: xfconf.eclass
# @MAINTAINER:
@@ -63,8 +63,9 @@ EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst
# @FUNCTION: xfconf_use_debug
# @DESCRIPTION:
-# Return --enable-debug, null, --enable-debug=full or --disable-debug based on
-# XFCONF_FULL_DEBUG variable and USE debug
+# If IUSE has debug, return --enable-debug=minimum.
+# If USE debug is enabled, return --enable-debug which is same as --enable-debug=yes.
+# If USE debug is enabled and XFCONF_FULL_DEBUG variable is set, return --enable-debug=full.
xfconf_use_debug() {
if has debug ${IUSE}; then
if use debug; then
@@ -74,9 +75,7 @@ xfconf_use_debug() {
echo "--enable-debug"
fi
else
- if [[ -n $XFCONF_FULL_DEBUG ]]; then
- echo "--disable-debug"
- fi
+ echo "--enable-debug=minimum"
fi
fi
}