millerson.name/gentoo
2
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-08 00:10:15 +03:00
Code Packages Projects Releases Wiki Activity

dev-build/autoconf: update autoreconf patch for >=gettext-0.24

Browse Source 
I think at this point..
1) sys-devel/gettext is ready in terms of any changes needed to that package;
2) autotools.eclass's eautoreconf needs updating to match the autoreconf patches
   from Bruno which we're applying here;
3) autotools.eclass should seriously consider using autoreconf instead, not
   reinventing it

Also, stable for remaining arches to make it easier to update the patch
in-place.

Bug: https://bugs.gentoo.org/957583
Closes: https://bugs.gentoo.org/962269
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2025-10-05 15:58:55 +01:00
parent fd86aaeb4d
commit 3dab132e84
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-build/autoconf/autoconf-2.72-r3.ebuild → dev-build/autoconf/autoconf-2.72-r4.ebuild
View File

@@ -29,7 +29,7 @@ else
S="${WORKDIR}"/${MY_P}
if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"

41
dev-build/autoconf/files/autoconf-2.72-gettext-0.25-autoreconf-Invoke-autopoint-in-more-situations.patch
View File

@@ -1,22 +1,23 @@
https://savannah.gnu.org/support/?111272
https://file.savannah.gnu.org/file/0001-autoreconf-Invoke-autopoint-in-more-situations.patch?file_id=57356
https://file.savannah.gnu.org/file/0001-autoreconf-Invoke-autopoint-in-more-situations.patch?file_id=57421
From 797eceb60214565db1f13339708c288c522e34a2 Mon Sep 17 00:00:00 2001
From e2a4935b45f273410e975ecf56ab26ad72855df0 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Wed, 2 Jul 2025 02:43:41 +0200
Subject: [PATCH] autoreconf: Invoke autopoint in more situations.
Subject: [PATCH 1/2] autoreconf: Invoke autopoint in more situations.
Reported in <https://savannah.gnu.org/support/?111272>.
* bin/autoreconf.in (autoreconf_current_directory): Invoke autopoint also when
the package uses AM_ICONV, AC_LIB_LINKFLAGS, AC_LIB_HAVE_LINKFLAGS, or
GUILE_FLAGS.
the package uses AM_GNU_GETTEXT (without AM_GNU_GETTEXT_VERSION), AM_PO_SUBDIRS,
AM_ICONV, AC_LIB_LINKFLAGS, AC_LIB_HAVE_LINKFLAGS, AC_LIB_LINKFLAGS_FROM_LIBS,
or GUILE_FLAGS.
---
bin/autoreconf.in | 75 +++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 72 insertions(+), 3 deletions(-)
bin/autoreconf.in | 80 ++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 76 insertions(+), 4 deletions(-)
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index a5ffc6fa..3f6a74fe 100644
index a5ffc6fa..207900df 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -440,6 +440,8 @@ sub autoreconf_current_directory ($)
@@ -28,16 +29,22 @@ index a5ffc6fa..3f6a74fe 100644
my $uses_gettext;
if (-f $configure_ac)
{
@@ -449,6 +451,8 @@ sub autoreconf_current_directory ($)
@@ -449,8 +451,13 @@ sub autoreconf_current_directory ($)
s/#.*//;
s/dnl.*//;
$uses_autoconf = 1 if /AC_INIT/;
+ $uses_liblink = 1 if /AC_LIB_(?:HAVE_)LINKFLAGS/;
+ $uses_liblink = 1 if /AC_LIB_HAVE_LINKFLAGS/;
+ $uses_liblink = 1 if /AC_LIB_LINKFLAGS/;
+ $uses_liblink = 1 if /AC_LIB_LINKFLAGS_FROM_LIBS/;
+ $uses_iconv = 1 if /AM_ICONV/;
# See below for why we look for gettext here.
$uses_gettext = 1 if /^AM_GNU_GETTEXT_(?:REQUIRE_)?VERSION/;
- $uses_gettext = 1 if /^AM_GNU_GETTEXT_(?:REQUIRE_)?VERSION/;
+ $uses_gettext = 1 if /AM_GNU_GETTEXT/;
+ $uses_gettext = 1 if /AM_PO_SUBDIRS/;
}
@@ -485,7 +489,7 @@ sub autoreconf_current_directory ($)
if (!$uses_autoconf)
{
@@ -485,7 +492,7 @@ sub autoreconf_current_directory ($)
# Actually, it is even more restrictive, as it greps for
# '^AM_GNU_GETTEXT_(REQUIRE_)?VERSION('. We did this above, while
# scanning configure.ac.
@@ -46,7 +53,7 @@ index a5ffc6fa..3f6a74fe 100644
{
verb "$configure_ac: not using Gettext";
}
@@ -495,8 +499,21 @@ sub autoreconf_current_directory ($)
@@ -495,8 +502,21 @@ sub autoreconf_current_directory ($)
}
else
{
@@ -70,7 +77,7 @@ index a5ffc6fa..3f6a74fe 100644
}
@@ -576,6 +593,8 @@ sub autoreconf_current_directory ($)
@@ -576,6 +596,8 @@ sub autoreconf_current_directory ($)
# from the final autoconf invocation.
my $aux_dir;
my @aux_files;
@@ -79,7 +86,7 @@ index a5ffc6fa..3f6a74fe 100644
my $uses_gettext_via_traces;
my $uses_libtool;
my $uses_intltool;
@@ -603,6 +622,11 @@ sub autoreconf_current_directory ($)
@@ -603,6 +625,11 @@ sub autoreconf_current_directory ($)
'AM_PROG_LIBTOOL',
'LT_INIT',
'LT_CONFIG_LTDL_DIR',
@@ -91,7 +98,7 @@ index a5ffc6fa..3f6a74fe 100644
'AM_GNU_GETTEXT',
'AM_INIT_AUTOMAKE',
'GTK_DOC_CHECK',
@@ -617,6 +641,15 @@ sub autoreconf_current_directory ($)
@@ -617,6 +644,15 @@ sub autoreconf_current_directory ($)
$aux_dir = $args[0] if $macro eq "AC_CONFIG_AUX_DIR";
push @aux_files, $args[0] if $macro eq "AC_REQUIRE_AUX_FILE";
$uses_autoconf = 1 if $macro eq "AC_INIT";
@@ -107,7 +114,7 @@ index a5ffc6fa..3f6a74fe 100644
$uses_gettext_via_traces = 1 if $macro eq "AM_GNU_GETTEXT";
$uses_libtool = 1 if $macro eq "AC_PROG_LIBTOOL"
|| $macro eq "AM_PROG_LIBTOOL"
@@ -741,6 +774,42 @@ sub autoreconf_current_directory ($)
@@ -741,6 +777,42 @@ sub autoreconf_current_directory ($)
}