gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

dev-build/autoconf: rebase prefix patch for 2.73

Browse Source 
Closes: https://bugs.gentoo.org/971443
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2026-04-01 22:57:47 +01:00
parent d6ba14d61e
commit c9d02c3c9a
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-build/autoconf/autoconf-2.73-r1.ebuild
View File

@@ -81,7 +81,7 @@ src_prepare() {
# usr/bin/libtool is provided by binutils-apple, need gnu libtool
if [[ ${CHOST} == *-darwin* ]] ; then
PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
PATCHES+=( "${FILESDIR}"/${PN}-2.73-darwin.patch )
fi
# Save timestamp to avoid later makeinfo call

8
dev-build/autoconf/autoconf-9999.ebuild
View File

@@ -55,12 +55,16 @@ BDEPEND+="
"
RDEPEND="
${BDEPEND}
>=dev-build/autoconf-wrapper-20231224
>=dev-build/autoconf-wrapper-20260320
sys-devel/gnuconfig
!~${CATEGORY}/${P}:2.5
"
[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
PATCHES=(
"${FILESDIR}"/${PN}-2.73-maintainer-mode-autoheader.patch
)
src_prepare() {
if [[ ${PV} == *9999 ]] ; then
# Avoid the "dirty" suffix in the git version by generating it
@@ -77,7 +81,7 @@ src_prepare() {
# usr/bin/libtool is provided by binutils-apple, need gnu libtool
if [[ ${CHOST} == *-darwin* ]] ; then
PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
PATCHES+=( "${FILESDIR}"/${PN}-2.73-darwin.patch )
fi
# Save timestamp to avoid later makeinfo call

13
dev-build/autoconf/files/autoconf-2.73-darwin.patch Normal file
View File

@@ -0,0 +1,13 @@
We rename libtoolize -> glibtoolize on macOS to avoid conflicting with
the system tool.
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -130,7 +130,7 @@ my %C = (
autom4te => $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@',
automake => $ENV{'AUTOMAKE'} || 'automake',
aclocal => $ENV{'ACLOCAL'} || 'aclocal',
- libtoolize => $ENV{'LIBTOOLIZE'} || 'libtoolize',
+ libtoolize => $ENV{'LIBTOOLIZE'} || 'glibtoolize',
intltoolize => $ENV{'INTLTOOLIZE'} || 'intltoolize',
gtkdocize => $ENV{'GTKDOCIZE'} || 'gtkdocize',
autopoint => $ENV{'AUTOPOINT'} || 'autopoint',