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

[Fabian Groffen]

commit:     c5acc17d94e4f034776ea6cf1ff70ce06f815f91
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu May  4 13:38:33 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu May  4 13:38:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c5acc17d

scripts/bootstrap-prefix: drop Solaris NM override, use Python 3.10 again

Python 3.11 doesn't work on Solaris, use 3.10 it doesn't matter for
stage1 for as long as Portage runs anyway.

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

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

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index de4f70201f..4610358c0d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -291,11 +291,6 @@ configure_toolchain() {
                                        compiler_stage1=${compiler_stage1/" 
dev-libs/mpfr "/" <dev-libs/mpfr-4 "}
                                        ;;
                        esac
-                       local nmout=$(nm -B 2>&1)
-                       case "${nmout}" in
-                               */dev/null*)  :                            ;;  
# apparently GNU
-                               *)            export NM="$(type -P nm) -p" ;;  
# Solaris nm
-                       esac
                        ;;
                *-linux*)
                        is-rap && einfo "Triggering Linux RAP bootstrap"
@@ -1001,7 +996,7 @@ python_ver() {
        if [[ ${CHOST} == *-cygwin* ]] ; then
          echo 3.9   # keep this number in line with PV below for stage1,2
        else
-         echo 3.11   # keep this number in line with PV below for stage1,2
+         echo 3.10   # keep this number in line with PV below for stage1,2
        fi
 }
 
@@ -1009,7 +1004,7 @@ bootstrap_python() {
        if [[ ${CHOST} == *-cygwin* ]] ; then
                PV=$(python_ver).10
        else
-               PV=$(python_ver).3
+               PV=$(python_ver).4
        fi
        A=Python-${PV}.tar.xz
        einfo "Bootstrapping ${A%.tar.*}"