* [gentoo-dev] [PATCH] gnome2.eclass does not respect ECONF_SOURCE
@ 2012-12-05 23:02 Doug Goldstein
2012-12-05 23:28 ` Gilles Dartiguelongue
2013-05-09 0:59 ` Mike Frysinger
0 siblings, 2 replies; 6+ messages in thread
From: Doug Goldstein @ 2012-12-05 23:02 UTC (permalink / raw
To: gentoo-dev; +Cc: 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] [PATCH] gnome2.eclass does not respect ECONF_SOURCE
2012-12-05 23:02 [gentoo-dev] [PATCH] gnome2.eclass does not respect ECONF_SOURCE Doug Goldstein
@ 2012-12-05 23:28 ` Gilles Dartiguelongue
2013-05-09 0:59 ` Mike Frysinger
1 sibling, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-05 23:28 UTC (permalink / raw
To: gentoo-dev
[-- Attachment #1: Type: text/plain, Size: 408 bytes --]
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 <eva@gentoo.org>
Gentoo
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] [PATCH] gnome2.eclass does not respect ECONF_SOURCE
2012-12-05 23:02 [gentoo-dev] [PATCH] gnome2.eclass does not respect ECONF_SOURCE Doug Goldstein
2012-12-05 23:28 ` Gilles Dartiguelongue
@ 2013-05-09 0:59 ` Mike Frysinger
2013-05-09 16:59 ` Pacho Ramos
1 sibling, 1 reply; 6+ messages in thread
From: Mike Frysinger @ 2013-05-09 0:59 UTC (permalink / raw
To: gentoo-dev; +Cc: Doug Goldstein
[-- Attachment #1: Type: Text/Plain, Size: 225 bytes --]
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
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] [PATCH] gnome2.eclass does not respect ECONF_SOURCE
2013-05-09 0:59 ` Mike Frysinger
@ 2013-05-09 16:59 ` Pacho Ramos
2013-05-23 19:31 ` Mike Frysinger
0 siblings, 1 reply; 6+ messages in thread
From: Pacho Ramos @ 2013-05-09 16:59 UTC (permalink / raw
To: gentoo-dev; +Cc: gnome
El mié, 08-05-2013 a las 20:59 -0400, Mike Frysinger escribió:
> 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
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)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] [PATCH] gnome2.eclass does not respect ECONF_SOURCE
2013-05-09 16:59 ` Pacho Ramos
@ 2013-05-23 19:31 ` Mike Frysinger
2013-05-24 3:35 ` Doug Goldstein
0 siblings, 1 reply; 6+ messages in thread
From: Mike Frysinger @ 2013-05-23 19:31 UTC (permalink / raw
To: gentoo-dev; +Cc: Pacho Ramos, gnome
[-- Attachment #1: Type: Text/Plain, Size: 2702 bytes --]
On Thursday 09 May 2013 12:59:11 Pacho Ramos wrote:
> El mié, 08-05-2013 a las 20:59 -0400, Mike Frysinger escribió:
> > 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
>
> 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)
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
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] [PATCH] gnome2.eclass does not respect ECONF_SOURCE
2013-05-23 19:31 ` Mike Frysinger
@ 2013-05-24 3:35 ` Doug Goldstein
0 siblings, 0 replies; 6+ messages in thread
From: Doug Goldstein @ 2013-05-24 3:35 UTC (permalink / raw
To: gentoo-dev; +Cc: Pacho Ramos, gnome
[-- Attachment #1: Type: text/plain, Size: 3432 bytes --]
On Thu, May 23, 2013 at 2:31 PM, Mike Frysinger <vapier@gentoo.org> wrote:
> On Thursday 09 May 2013 12:59:11 Pacho Ramos wrote:
> > El mié, 08-05-2013 a las 20:59 -0400, Mike Frysinger escribió:
> > > 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
> >
> > 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)
>
> 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
>
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
[-- Attachment #2: Type: text/html, Size: 4642 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-05-24 3:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-05 23:02 [gentoo-dev] [PATCH] gnome2.eclass does not respect ECONF_SOURCE Doug Goldstein
2012-12-05 23:28 ` Gilles Dartiguelongue
2013-05-09 0:59 ` Mike Frysinger
2013-05-09 16:59 ` Pacho Ramos
2013-05-23 19:31 ` Mike Frysinger
2013-05-24 3:35 ` Doug Goldstein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox