diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2013-01-13 22:35:28 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2013-01-13 22:35:28 +0000 |
| commit | 92d75c19d05c748b20e2e953179d088c6e762685 (patch) | |
| tree | 2f7bdab662038796c011c22ec8ece91cb2ac1f16 /eclass | |
| parent | Remove boost versioning for remaining versions, bug #445180 (diff) | |
| download | gentoo-2-92d75c19d05c748b20e2e953179d088c6e762685.tar.gz gentoo-2-92d75c19d05c748b20e2e953179d088c6e762685.tar.bz2 gentoo-2-92d75c19d05c748b20e2e953179d088c6e762685.zip | |
Allow ebuild override of eclass generated econf.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/gnome2.eclass | 24 |
2 files changed, 16 insertions, 13 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0ebf5e892ba4..1d8fb7c5a9cd 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.613 2013/01/12 23:18:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.614 2013/01/13 22:35:28 eva Exp $ + + 13 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> gnome2.eclass: + Allow ebuild override of eclass generated econf. 12 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: Provide best implementation's build dir in python_*_all() as BUILD_DIR to diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index e5db146a7774..8ad48d668f58 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.117 2012/12/16 14:11:58 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.118 2013/01/13 22:35:28 eva Exp $ # @ECLASS: gnome2.eclass # @MAINTAINER: @@ -118,7 +118,7 @@ gnome2_src_configure() { # Update the GNOME configuration options if [[ ${GCONF_DEBUG} != 'no' ]] ; then if use debug ; then - G2CONF="${G2CONF} --enable-debug=yes" + G2CONF="--enable-debug=yes ${G2CONF}" fi fi @@ -130,45 +130,45 @@ gnome2_src_configure() { # rebuild docs. # Preserve old behavior for older EAPI. if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then - if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then - G2CONF="${G2CONF} $(use_enable doc gtk-doc)" + if has ${EAPI:-0} 0 1 2 3 4 && has doc ${IUSE} ; then + G2CONF="$(use_enable doc gtk-doc) ${G2CONF}" else - G2CONF="${G2CONF} --disable-gtk-doc" + G2CONF="--disable-gtk-doc ${G2CONF}" fi fi # Pass --disable-maintainer-mode when needed if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \ ${ECONF_SOURCE:-.}/configure.*; then - G2CONF="${G2CONF} --disable-maintainer-mode" + G2CONF="--disable-maintainer-mode ${G2CONF}" fi # Pass --disable-scrollkeeper when possible if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then - G2CONF="${G2CONF} --disable-scrollkeeper" + G2CONF="--disable-scrollkeeper ${G2CONF}" fi # Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308 if has ${EAPI:-0} 0 1 2 3 4; then if grep -q "disable-silent-rules" ${ECONF_SOURCE:-.}/configure; then - G2CONF="${G2CONF} --disable-silent-rules" + G2CONF="--disable-silent-rules ${G2CONF}" fi fi # Pass --disable-schemas-install when possible if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then - G2CONF="${G2CONF} --disable-schemas-install" + G2CONF="--disable-schemas-install ${G2CONF}" fi # Pass --disable-schemas-compile when possible if grep -q "disable-schemas-compile" ${ECONF_SOURCE:-.}/configure; then - G2CONF="${G2CONF} --disable-schemas-compile" + G2CONF="--disable-schemas-compile ${G2CONF}" fi # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) addwrite "$(unset HOME; echo ~)/.gnome2" - econf "$@" ${G2CONF} + econf ${G2CONF} "$@" } # @FUNCTION: gnome2_src_compile |