[gentoo-dev] [PATCH] gnome2.eclass does not respect ECONF_SOURCE

[Doug Goldstein]

The gnome2.eclass checks the configure script for certain items and
adjusts the arguments to econf based on those checks. Unfortunately
when checking the configure script it did not respect ECONF_SOURCE.
---
gnome2.eclass | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnome2.eclass b/gnome2.eclass
index 3f7b2da..1f3e005 100644
--- a/gnome2.eclass
+++ b/gnome2.eclass
@@ -129,7 +129,7 @@ gnome2_src_configure() {
# Remember to drop 'doc' USE flag from your package if it was only used to
# rebuild docs.
# Preserve old behavior for older EAPI.
- if grep -q "enable-gtk-doc" configure ; then
+ 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)"
else
@@ -138,24 +138,25 @@ gnome2_src_configure() {
fi

# Pass --disable-maintainer-mode when needed
- if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" configure.*; then
+ if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \
+ ${ECONF_SOURCE:-.}/configure.*; then
G2CONF="${G2CONF} --disable-maintainer-mode"
fi

# Pass --disable-scrollkeeper when possible
- if grep -q "disable-scrollkeeper" configure; then
+ if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then
G2CONF="${G2CONF} --disable-scrollkeeper"
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" configure; then
+ if grep -q "disable-silent-rules" ${ECONF_SOURCE:-.}/configure; then
G2CONF="${G2CONF} --disable-silent-rules"
fi
fi

# Pass --disable-schemas-install when possible
- if grep -q "disable-schemas-install" configure; then
+ if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then
G2CONF="${G2CONF} --disable-schemas-install"
fi

--
1.8.0

[Gilles Dartiguelongue]

Le mercredi 05 décembre 2012 à 17:02 -0600, Doug Goldstein a écrit :
> class checks the configure script for certain items and
> adjusts the arguments to econf based on those checks. Unfortunately
> when checking the configure script it did not respect ECONF_SOURCE.

Looks good. Might need to apply these fixes to gstreamer eclasses as
well.

--
Gilles Dartiguelongue <e...@gentoo.org>
Gentoo

[Mike Frysinger]

On Wednesday 05 December 2012 18:02:51 Doug Goldstein wrote:
> - if grep -q "disable-scrollkeeper" configure; then
> + if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then

ECONF_SOURCE should be quoted
-mike

[Pacho Ramos]

If it doesn't cause any problem (it shouldn't, I think), feel free to
commit adding the quotes. Thanks for noticing! (will CC gnome team to
keep them aware)

[Mike Frysinger]

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.120
diff -u -p -r1.120 gnome2.eclass
--- gnome2.eclass 16 Jan 2013 23:01:02 -0000 1.120
+++ gnome2.eclass 23 May 2013 19:31:00 -0000
@@ -122,7 +122,7 @@ gnome2_src_configure() {

# Remember to drop 'doc' USE flag from your package if it was only used to
# rebuild docs.
# Preserve old behavior for older EAPI.

- if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then
+ if grep -q "enable-gtk-doc" "${ECONF_SOURCE:-.}"/configure ; then
if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
G2CONF="$(use_enable doc gtk-doc) ${G2CONF}"
else
@@ -132,29 +132,29 @@ gnome2_src_configure() {

# Pass --disable-maintainer-mode when needed

if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \
- ${ECONF_SOURCE:-.}/configure.*; then

+ "${ECONF_SOURCE:-.}"/configure.*; then

G2CONF="--disable-maintainer-mode ${G2CONF}"

fi

# Pass --disable-scrollkeeper when possible

- if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then

+ if grep -q "disable-scrollkeeper" "${ECONF_SOURCE:-.}"/configure; then

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
+ if grep -q "disable-silent-rules" "${ECONF_SOURCE:-.}"/configure; then
G2CONF="--disable-silent-rules ${G2CONF}"

fi
fi

# Pass --disable-schemas-install when possible

- if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then
+ if grep -q "disable-schemas-install" "${ECONF_SOURCE:-.}"/configure; then
G2CONF="--disable-schemas-install ${G2CONF}"
fi

# Pass --disable-schemas-compile when possible
- if grep -q "disable-schemas-compile" ${ECONF_SOURCE:-.}/configure; then
+ if grep -q "disable-schemas-compile" "${ECONF_SOURCE:-.}"/configure; then
G2CONF="--disable-schemas-compile ${G2CONF}"
fi

-mike

[Doug Goldstein]

I guess I forgot to commit that to the tree when I posted it a few days ago/week, w/e. Yeah commit that. My original commit was wrong.

--
Doug Goldstein