* [gentoo-dev] [PATCH 2/3] autotools.eclass: Allow running the tools only in src_prepare
2023-05-28 13:16 [gentoo-dev] [PATCH 1/3] autotools.eclass: Downgrade eqawarn for renaming configure.in Ulrich Müller
@ 2023-05-28 13:16 ` Ulrich Müller
2023-05-28 13:38 ` Sam James
2023-05-28 13:16 ` [gentoo-dev] [PATCH 3/3] autotools.eclass: Whitespace Ulrich Müller
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Ulrich Müller @ 2023-05-28 13:16 UTC (permalink / raw
To: gentoo-dev; +Cc: base-system, Ulrich Müller
Running them in src_unpack made sense only in EAPIs 0 and 1.
Fixes: 18fda95cea306efe8009d1100195225acd8f8756
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
eclass/autotools.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 3a040b863eea..7b94efc225fe 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -560,7 +560,7 @@ autotools_run_tool() {
shift
done
- if [[ ${EBUILD_PHASE_FUNC} != "src_unpack" && ${EBUILD_PHASE_FUNC} != "src_prepare" ]] ; then
+ if [[ ${EBUILD_PHASE_FUNC} != "src_prepare" ]] ; then
eqawarn "Running '${1}' in ${EBUILD_PHASE_FUNC} phase"
fi
--
2.40.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-dev] [PATCH 3/3] autotools.eclass: Whitespace
2023-05-28 13:16 [gentoo-dev] [PATCH 1/3] autotools.eclass: Downgrade eqawarn for renaming configure.in Ulrich Müller
2023-05-28 13:16 ` [gentoo-dev] [PATCH 2/3] autotools.eclass: Allow running the tools only in src_prepare Ulrich Müller
@ 2023-05-28 13:16 ` Ulrich Müller
2023-05-28 13:36 ` [gentoo-dev] [PATCH 1/3] autotools.eclass: Downgrade eqawarn for renaming configure.in Sam James
2023-05-28 13:44 ` Pacho Ramos
3 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2023-05-28 13:16 UTC (permalink / raw
To: gentoo-dev; +Cc: base-system, Ulrich Müller
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
eclass/autotools.eclass | 1 -
1 file changed, 1 deletion(-)
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 7b94efc225fe..77124e098aac 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -389,7 +389,6 @@ eautoconf() {
die "No configure.{ac,in} present!"
fi
-
if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then
case ${EAPI} in
6|7)
--
2.40.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [gentoo-dev] [PATCH 1/3] autotools.eclass: Downgrade eqawarn for renaming configure.in
2023-05-28 13:16 [gentoo-dev] [PATCH 1/3] autotools.eclass: Downgrade eqawarn for renaming configure.in Ulrich Müller
2023-05-28 13:16 ` [gentoo-dev] [PATCH 2/3] autotools.eclass: Allow running the tools only in src_prepare Ulrich Müller
2023-05-28 13:16 ` [gentoo-dev] [PATCH 3/3] autotools.eclass: Whitespace Ulrich Müller
@ 2023-05-28 13:36 ` Sam James
2023-05-28 13:44 ` Pacho Ramos
3 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-05-28 13:36 UTC (permalink / raw
To: gentoo-dev; +Cc: base-system, Ulrich Müller
[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]
Ulrich Müller <ulm@gentoo.org> writes:
> At this point, almost all upstreams will have switched to configure.ac.
> Therefore, configure.in is most likely an indication of an inactive
> upstream, and there is no useful way for the ebuild maintainer to
> silence the warning (other than the ebuild renaming the file).
Ionen's point was that such packages therefore regularly get updates
so a QA warning when rarely revbumping it isn't necessarily a problem either.
But I also don't think it's likely that upstream will ever actually
enforce this, so OK.
>
> Keep the message as einfo, so there is still an indication that the file
> was renamed.
>
> Bug: https://bugs.gentoo.org/426262
> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
> ---
> eclass/autotools.eclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
> index 91046b9f82f3..3a040b863eea 100644
> --- a/eclass/autotools.eclass
> +++ b/eclass/autotools.eclass
> @@ -400,7 +400,7 @@ eautoconf() {
> *)
> # Move configure file to the new location only on newer EAPIs to ensure
> # checks are done rather than retroactively breaking ebuilds.
> - eqawarn "Moving configure.in to configure.ac (bug #426262)"
> + einfo "Moving configure.in to configure.ac (bug #426262)"
> mv configure.{in,ac} || die
> ;;
> esac
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 377 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [gentoo-dev] [PATCH 1/3] autotools.eclass: Downgrade eqawarn for renaming configure.in
2023-05-28 13:16 [gentoo-dev] [PATCH 1/3] autotools.eclass: Downgrade eqawarn for renaming configure.in Ulrich Müller
` (2 preceding siblings ...)
2023-05-28 13:36 ` [gentoo-dev] [PATCH 1/3] autotools.eclass: Downgrade eqawarn for renaming configure.in Sam James
@ 2023-05-28 13:44 ` Pacho Ramos
3 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2023-05-28 13:44 UTC (permalink / raw
To: gentoo-dev; +Cc: base-system, Ulrich Müller
[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]
El dom, 28-05-2023 a las 15:16 +0200, Ulrich Müller escribió:
> At this point, almost all upstreams will have switched to
> configure.ac.
> Therefore, configure.in is most likely an indication of an inactive
> upstream, and there is no useful way for the ebuild maintainer to
> silence the warning (other than the ebuild renaming the file).
>
> Keep the message as einfo, so there is still an indication that the
> file
> was renamed.
>
> Bug: https://bugs.gentoo.org/426262
> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
> ---
> eclass/autotools.eclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
> index 91046b9f82f3..3a040b863eea 100644
> --- a/eclass/autotools.eclass
> +++ b/eclass/autotools.eclass
> @@ -400,7 +400,7 @@ eautoconf() {
> *)
> # Move configure file to the new
> location only on newer EAPIs to ensure
> # checks are done rather than
> retroactively breaking ebuilds.
> - eqawarn "Moving configure.in to
> configure.ac (bug #426262)"
> + einfo "Moving configure.in to
> configure.ac (bug #426262)"
> mv configure.{in,ac} || die
> ;;
> esac
LGTM
Thanks!
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread