public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-dev] [PATCH] xorg-3.eclass: EAUTORECONF_DEPENDS belong to BDEPEND
@ 2019-06-13 11:08 Michael Haubenwallner
  2019-06-13 12:45 ` James Le Cuirot
  0 siblings, 1 reply; 4+ messages in thread
From: Michael Haubenwallner @ 2019-06-13 11:08 UTC (permalink / raw
  To: gentoo-dev; +Cc: x11, Michael Haubenwallner

EAUTORECONF_DEPENDS is non-empty for ppc-aix and x86-winnt only.
Also, unset variable 'arch' after use.
---
 eclass/xorg-3.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index 6ac90a64d59..f135058fba6 100644
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -116,7 +116,8 @@ WANT_AUTOMAKE="latest"
 for arch in ${XORG_EAUTORECONF_ARCHES}; do
 	EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
 done
-DEPEND+=" ${EAUTORECONF_DEPENDS}"
+unset arch
+BDEPEND+=" ${EAUTORECONF_DEPENDS}"
 [[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}"
 unset EAUTORECONF_DEPENDS
 unset EAUTORECONF_DEPEND
-- 
2.19.2



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [gentoo-dev] [PATCH] xorg-3.eclass: EAUTORECONF_DEPENDS belong to BDEPEND
  2019-06-13 11:08 [gentoo-dev] [PATCH] xorg-3.eclass: EAUTORECONF_DEPENDS belong to BDEPEND Michael Haubenwallner
@ 2019-06-13 12:45 ` James Le Cuirot
  2019-06-13 13:02   ` [gentoo-dev] " Michael Haubenwallner
  0 siblings, 1 reply; 4+ messages in thread
From: James Le Cuirot @ 2019-06-13 12:45 UTC (permalink / raw
  To: gentoo-dev

[-- Attachment #1: Type: text/plain, Size: 982 bytes --]

On Thu, 13 Jun 2019 13:08:15 +0200
Michael Haubenwallner <haubi@gentoo.org> wrote:

> EAUTORECONF_DEPENDS is non-empty for ppc-aix and x86-winnt only.
> Also, unset variable 'arch' after use.
> ---
>  eclass/xorg-3.eclass | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
> index 6ac90a64d59..f135058fba6 100644
> --- a/eclass/xorg-3.eclass
> +++ b/eclass/xorg-3.eclass
> @@ -116,7 +116,8 @@ WANT_AUTOMAKE="latest"
>  for arch in ${XORG_EAUTORECONF_ARCHES}; do
>  	EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
>  done
> -DEPEND+=" ${EAUTORECONF_DEPENDS}"
> +unset arch
> +BDEPEND+=" ${EAUTORECONF_DEPENDS}"
>  [[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}"
>  unset EAUTORECONF_DEPENDS
>  unset EAUTORECONF_DEPEND

Apart from the unset, the comment doesn't seem to relate to the actual
change?

-- 
James Le Cuirot (chewi)
Gentoo Linux Developer

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-dev] Re: [PATCH] xorg-3.eclass: EAUTORECONF_DEPENDS belong to BDEPEND
  2019-06-13 12:45 ` James Le Cuirot
@ 2019-06-13 13:02   ` Michael Haubenwallner
  2019-06-13 13:10     ` James Le Cuirot
  0 siblings, 1 reply; 4+ messages in thread
From: Michael Haubenwallner @ 2019-06-13 13:02 UTC (permalink / raw
  To: gentoo-dev; +Cc: x11


[-- Attachment #1.1.1: Type: text/plain, Size: 1123 bytes --]

On 6/13/19 2:45 PM, James Le Cuirot wrote:
> On Thu, 13 Jun 2019 13:08:15 +0200
> Michael Haubenwallner <haubi@gentoo.org> wrote:
> 
>> EAUTORECONF_DEPENDS is non-empty for ppc-aix and x86-winnt only.
>> Also, unset variable 'arch' after use.
>> ---
>>  eclass/xorg-3.eclass | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
>> index 6ac90a64d59..f135058fba6 100644
>> --- a/eclass/xorg-3.eclass
>> +++ b/eclass/xorg-3.eclass
>> @@ -116,7 +116,8 @@ WANT_AUTOMAKE="latest"
>>  for arch in ${XORG_EAUTORECONF_ARCHES}; do
>>  	EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
>>  done
>> -DEPEND+=" ${EAUTORECONF_DEPENDS}"
>> +unset arch
>> +BDEPEND+=" ${EAUTORECONF_DEPENDS}"
>>  [[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}"
>>  unset EAUTORECONF_DEPENDS
>>  unset EAUTORECONF_DEPEND
> 
> Apart from the unset, the comment doesn't seem to relate to the actual
> change?

Agreed: The relation should become clear with 15 lines of context.
Or do you mean something else?

Thanks!
/haubi/

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: 0001-xorg-3.eclass-EAUTORECONF_DEPENDS-belong-to-BDEPEND.patch --]
[-- Type: text/x-patch; name="0001-xorg-3.eclass-EAUTORECONF_DEPENDS-belong-to-BDEPEND.patch", Size: 1695 bytes --]

From 1eb3709d84b04c4fbbed342de8f5721233e35e2f Mon Sep 17 00:00:00 2001
From: Michael Haubenwallner <haubi@gentoo.org>
Date: Thu, 13 Jun 2019 12:58:04 +0200
Subject: [PATCH] xorg-3.eclass: EAUTORECONF_DEPENDS belong to BDEPEND

EAUTORECONF_DEPENDS is non-empty for ppc-aix and x86-winnt only.
Also, unset variable 'arch' after use.
---
 eclass/xorg-3.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index 6ac90a64d59..f135058fba6 100644
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -104,31 +104,32 @@ fi
 
 # Set up autotools shared dependencies
 # Remember that all versions here MUST be stable
 XORG_EAUTORECONF_ARCHES="ppc-aix x86-winnt"
 EAUTORECONF_DEPEND+="
 	>=sys-devel/libtool-2.2.6a
 	sys-devel/m4"
 if [[ ${PN} != util-macros ]] ; then
 	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0"
 fi
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 for arch in ${XORG_EAUTORECONF_ARCHES}; do
 	EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
 done
-DEPEND+=" ${EAUTORECONF_DEPENDS}"
+unset arch
+BDEPEND+=" ${EAUTORECONF_DEPENDS}"
 [[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}"
 unset EAUTORECONF_DEPENDS
 unset EAUTORECONF_DEPEND
 
 # @ECLASS-VARIABLE: XORG_STATIC
 # @DESCRIPTION:
 # Enables static-libs useflag. Set to no, if your package gets:
 #
 # QA: configure: WARNING: unrecognized options: --disable-static
 : ${XORG_STATIC:="yes"}
 
 # Add static-libs useflag where useful.
 if [[ ${XORG_STATIC} == yes \
 		&& ${CATEGORY} != app-doc \
 		&& ${CATEGORY} != x11-apps \
-- 
2.19.2


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 981 bytes --]

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [gentoo-dev] Re: [PATCH] xorg-3.eclass: EAUTORECONF_DEPENDS belong to BDEPEND
  2019-06-13 13:02   ` [gentoo-dev] " Michael Haubenwallner
@ 2019-06-13 13:10     ` James Le Cuirot
  0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2019-06-13 13:10 UTC (permalink / raw
  To: gentoo-dev

[-- Attachment #1: Type: text/plain, Size: 1395 bytes --]

On Thu, 13 Jun 2019 15:02:23 +0200
Michael Haubenwallner <haubi@gentoo.org> wrote:

> On 6/13/19 2:45 PM, James Le Cuirot wrote:
> > On Thu, 13 Jun 2019 13:08:15 +0200
> > Michael Haubenwallner <haubi@gentoo.org> wrote:
> > 
> >> EAUTORECONF_DEPENDS is non-empty for ppc-aix and x86-winnt only.
> >> Also, unset variable 'arch' after use.
> >> ---
> >>  eclass/xorg-3.eclass | 3 ++-
> >>  1 file changed, 2 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
> >> index 6ac90a64d59..f135058fba6 100644
> >> --- a/eclass/xorg-3.eclass
> >> +++ b/eclass/xorg-3.eclass
> >> @@ -116,7 +116,8 @@ WANT_AUTOMAKE="latest"
> >>  for arch in ${XORG_EAUTORECONF_ARCHES}; do
> >>  	EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
> >>  done
> >> -DEPEND+=" ${EAUTORECONF_DEPENDS}"
> >> +unset arch
> >> +BDEPEND+=" ${EAUTORECONF_DEPENDS}"
> >>  [[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}"
> >>  unset EAUTORECONF_DEPENDS
> >>  unset EAUTORECONF_DEPEND
> > 
> > Apart from the unset, the comment doesn't seem to relate to the actual
> > change?
> 
> Agreed: The relation should become clear with 15 lines of context.
> Or do you mean something else?

Okay, I get it now. I was also slightly confused by the very similar
variable names.

-- 
James Le Cuirot (chewi)
Gentoo Linux Developer

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-06-13 13:10 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-13 11:08 [gentoo-dev] [PATCH] xorg-3.eclass: EAUTORECONF_DEPENDS belong to BDEPEND Michael Haubenwallner
2019-06-13 12:45 ` James Le Cuirot
2019-06-13 13:02   ` [gentoo-dev] " Michael Haubenwallner
2019-06-13 13:10     ` James Le Cuirot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox