From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C17C515800D for ; Tue, 4 Jul 2023 07:08:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFE15E0878; Tue, 4 Jul 2023 07:08:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6F30E0878 for ; Tue, 4 Jul 2023 07:08:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DDC1333BEE9 for ; Tue, 4 Jul 2023 07:08:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 297B1ABF for ; Tue, 4 Jul 2023 07:08:35 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1688454462.14fbc8f14c4c484e1809e001e262efca9b6f6ecd.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 14fbc8f14c4c484e1809e001e262efca9b6f6ecd X-VCS-Branch: master Date: Tue, 4 Jul 2023 07:08:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 274f0d09-3f01-4ced-8a35-bd38f11568a7 X-Archives-Hash: 97418a6464eb095aa05a604b9657b2d6 commit: 14fbc8f14c4c484e1809e001e262efca9b6f6ecd Author: Fabian Groffen gentoo org> AuthorDate: Tue Jul 4 07:07:42 2023 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jul 4 07:07:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=14fbc8f1 scripts/bootstrap-prefix: don't disable readline on bash "Recent" bash (5.1) compiles fine on Darwin 9 with readline enabled. Signed-off-by: Fabian Groffen 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 d722e0139f..9c86901e2e 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -872,14 +872,9 @@ bootstrap_gnu() { # care about manpages at this stage export ac_cv_path_POD2MAN=no - # Darwin9 in particular doesn't compile when using system readline, - # but we don't need any groovy input handling at all, so just disable it - [[ ${PN} == "bash" ]] && myconf="${myconf} --disable-readline" - # On e.g. musl systems bash will crash with a malloc error if we use # bash' internal malloc, so disable it during it this stage - [[ ${PN} == "bash" ]] && \ - myconf="${myconf} --without-bash-malloc" + [[ ${PN} == "bash" ]] && myconf="${myconf} --without-bash-malloc" # Ensure we don't read system-wide shell initialisation, it may # contain cruft, bug #650284 @@ -2187,7 +2182,7 @@ bootstrap_stage3() { # Portage should figure out itself what it needs to do, if anything. einfo "running emerge -uDNv system" estatus "stage3: emerge -uDNv system" - unset CFLAGS CXXFLAGS CPPFLAGS + unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS emerge --color n -uDNv system || return 1 # Remove anything that we don't need (compilers most likely)