[prev in list] [next in list] [prev in thread] [next in thread]
List: gentoo-dev
Subject: Re: [gentoo-dev] [PATCH] gnome2.eclass does not respect ECONF_SOURCE
From: Doug Goldstein <cardoe () gentoo ! org>
Date: 2013-05-24 3:35:39
Message-ID: CAFWqQMRyRbJXTiEdc-WCq=Y_0sLOr+_t77cytsnz-pq0sazThA () mail ! gmail ! com
[Download RAW message or body]
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 #3 (text/html)]
<div dir="ltr"><div class="gmail_extra">On Thu, May 23, 2013 at 2:31 PM, Mike \
Frysinger <span dir="ltr"><<a href="mailto:vapier@gentoo.org" \
target="_blank">vapier@gentoo.org</a>></span> wrote:<br><div class="gmail_quote"> \
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Thursday 09 May 2013 \
12:59:11 Pacho Ramos wrote:<br> > El mié, 08-05-2013 a las 20:59 -0400, Mike \
Frysinger escribió:<br> > > On Wednesday 05 December 2012 18:02:51 Doug \
Goldstein wrote:<br> > > > - if grep -q "disable-scrollkeeper" \
configure; then<br> > > > + if grep -q "disable-scrollkeeper" \
${ECONF_SOURCE:-.}/configure; then<br> > ><br>
> > ECONF_SOURCE should be quoted<br>
> > -mike<br>
><br>
> If it doesn't cause any problem (it shouldn't, I think), feel free \
to<br> > commit adding the quotes. Thanks for noticing! (will CC gnome team to<br>
> keep them aware)<br>
<br>
</div></div>Index: gnome2.eclass<br>
===================================================================<br>
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v<br>
retrieving revision 1.120<br>
diff -u -p -r1.120 gnome2.eclass<br>
--- gnome2.eclass 16 Jan 2013 23:01:02 -0000 1.120<br>
+++ gnome2.eclass 23 May 2013 19:31:00 -0000<br>
@@ -122,7 +122,7 @@ gnome2_src_configure() {<br>
<div class="im"> # Remember to drop 'doc' USE flag from your \
package if it was only used to<br> # rebuild docs.<br>
# Preserve old behavior for older EAPI.<br>
</div>- if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; \
then<br> + if grep -q "enable-gtk-doc" \
"${ECONF_SOURCE:-.}"/configure ; then<br>
if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then<br>
G2CONF="$(use_enable doc gtk-doc) \
${G2CONF}"<br> else<br>
@@ -132,29 +132,29 @@ gnome2_src_configure() {<br>
<div class="im"><br>
# Pass --disable-maintainer-mode when needed<br>
</div><div class="im"> if grep -q \
"^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \<br>
- ${ECONF_SOURCE:-.}/configure.*; then<br>
+ "${ECONF_SOURCE:-.}"/configure.*; then<br>
</div> G2CONF="--disable-maintainer-mode \
${G2CONF}"<br> <div class="im"> fi<br>
<br>
# Pass --disable-scrollkeeper when possible<br>
</div><div class="im">- if grep -q "disable-scrollkeeper" \
${ECONF_SOURCE:-.}/configure; then<br> + if grep -q \
"disable-scrollkeeper" "${ECONF_SOURCE:-.}"/configure; then<br> \
</div> G2CONF="--disable-scrollkeeper ${G2CONF}"<br> \
<div class="im"> fi<br> <br>
# Pass --disable-silent-rules when possible (not needed for eapi5), \
bug<br> #429308<br>
if has ${EAPI:-0} 0 1 2 3 4; then<br>
</div>- if grep -q "disable-silent-rules" \
${ECONF_SOURCE:-.}/configure; then<br> + if grep -q \
"disable-silent-rules" \
"${ECONF_SOURCE:-.}"/configure; then<br>
G2CONF="--disable-silent-rules \
${G2CONF}"<br> <div class="im"> fi<br>
fi<br>
<br>
# Pass --disable-schemas-install when possible<br>
</div>- if grep -q "disable-schemas-install" \
${ECONF_SOURCE:-.}/configure; then<br> + if grep -q \
"disable-schemas-install" "${ECONF_SOURCE:-.}"/configure; \
then<br>
G2CONF="--disable-schemas-install ${G2CONF}"<br>
fi<br>
<br>
# Pass --disable-schemas-compile when possible<br>
- if grep -q "disable-schemas-compile" \
${ECONF_SOURCE:-.}/configure; then<br> + if grep -q \
"disable-schemas-compile" "${ECONF_SOURCE:-.}"/configure; \
then<br>
G2CONF="--disable-schemas-compile ${G2CONF}"<br>
fi<br>
<span class="HOEnZb"><font color="#888888"><br>
-mike<br>
</font></span></blockquote></div><br>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.<br clear="all"><div><br></div>-- <br>Doug Goldstein </div></div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic