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 7141115953E for ; Fri, 29 Mar 2024 11:52:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E9F52BC016; Fri, 29 Mar 2024 11:52:14 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 845542BC016 for ; Fri, 29 Mar 2024 11:52:14 +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 B673A33C4EE for ; Fri, 29 Mar 2024 11:52:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 298EE1603 for ; Fri, 29 Mar 2024 11:52:12 +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: <1711713083.fc8ff18f3a1a54c592dcfdb3a5c0a514de6f0ad7.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: fc8ff18f3a1a54c592dcfdb3a5c0a514de6f0ad7 X-VCS-Branch: master Date: Fri, 29 Mar 2024 11:52:12 +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: b5bf31c2-23bd-435c-b468-32431427bb3e X-Archives-Hash: 68ec3f63fc604100c57925ba86b7b06a commit: fc8ff18f3a1a54c592dcfdb3a5c0a514de6f0ad7 Author: Fabian Groffen gentoo org> AuthorDate: Fri Mar 29 11:51:23 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Mar 29 11:51:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fc8ff18f scripts/bootstrap-prefix: fix Gentoo host shortcut path Thanks flow for pointing out. Closes: https://bugs.gentoo.org/927957 Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index c3daad42ca..cb15d53cd6 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1591,8 +1591,10 @@ bootstrap_stage1() { # Host compiler can output a variety of libdirs. At stage1, # they should be the same as lib. Otherwise libffi may not be - # found by python. - if is-rap ; then + # found by python. Don't do this when we're using a Gentoo host to + # speed up bootstrapping, it should be good, and we shouldn't be + # touching the host either. Bug #927957 + if is-rap && [[ ! -L "${ROOT}"/tmp ]] ; then [[ -d ${ROOT}/tmp/usr/lib ]] || mkdir -p "${ROOT}"/tmp/usr/lib local libdir for libdir in lib64 lib32 libx32; do