[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Fabian Groffen]

commit:     84eb38e630bc4e13091255f9134e3de4d3f957cf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  8 18:27:20 2025 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec  8 18:27:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=84eb38e6

scripts/bootstrap-prefix: fix stage1 on macOS

Since we restricted tar to >=1.30 we apparently dropped the one version
that still compiled.  Fix 1.35 to compile/link on macOS so the bootstrap
can go on.

While at it, disable-nls for all gnu-like packages, for we don't need
it, and it doesn't cause any problems anymore either.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 16860cedbe..26a4f54d31 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -862,6 +862,10 @@ bootstrap_gnu() {
        fi
 
        local -a myconf
+
+       # no point in doing NLS at this stage
+       myconf+=( --disable-nls )
+
        if [[ ${PN}-${PV} == "make-4.2.1" ]] ; then
                if [[ ${CHOST} == *-linux-gnu* ]] ; then
                        # force this, macros aren't set correctly with newer 
glibc
@@ -889,8 +893,6 @@ bootstrap_gnu() {
        fix_config_sub
 
        if [[ ${PN} == "grep" ]] ; then
-               # Solaris and OSX don't like it when --disable-nls is set,
-               # so just don't set it at all.
                # Solaris 11 has a messed up prce installation.  We don't need
                # it anyway, so just disable it
                myconf+=( "--disable-perl-regexp" )
@@ -912,7 +914,6 @@ bootstrap_gnu() {
                        "--enable-languages=c,c++"
                        "--disable-bootstrap"
                        "--disable-multilib"
-                       "--disable-nls"
                        "--disable-libsanitizer"
                )
 
@@ -974,6 +975,9 @@ bootstrap_gnu() {
        if [[ ${PN} == "tar" ]] ; then
                # really, not now, by the time we get there, we'll have it fixed
                myconf+=( --disable-year2038 )
+               # tar really insists on doing iconv stuff, even when it doesn't
+               # work (like on macOS), so force it off
+               sed -i -e '/HAVE_ICONV/d' config.h.in || die
        fi
 
        # SuSE 11.1 has GNU binutils-2.20, choking on crc32_x86