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 04B81159C96 for ; Thu, 25 Jul 2024 06:25:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB39BE29A4; Thu, 25 Jul 2024 06:25:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 CFD03E29A4 for ; Thu, 25 Jul 2024 06:25:44 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D08A733BDC5 for ; Thu, 25 Jul 2024 06:25:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7064F1E30 for ; Thu, 25 Jul 2024 06:25:42 +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: <1721888655.4abb9bae4adcc38f480b435dfa01a88f676e0c03.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: 4abb9bae4adcc38f480b435dfa01a88f676e0c03 X-VCS-Branch: master Date: Thu, 25 Jul 2024 06:25:42 +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: 7fb85800-c0d4-4d58-86ce-75c20f43f386 X-Archives-Hash: 9c3ce9074beb4c6505eb21180d1f51b4 commit: 4abb9bae4adcc38f480b435dfa01a88f676e0c03 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jul 25 06:24:15 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jul 25 06:24:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4abb9bae scripts/bootstrap-prefix: disable USE=pie for Solaris bootstrap Host compiler doesn't like -pie in the workload it has to do during bootstrap, so go through lengths to disable it. (Why can't we just override masks/forces from base?) Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 11ad8eb8e4..eb89fa4847 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -2032,6 +2032,13 @@ bootstrap_stage2() { # unless we only build the buildtool, bug #603012 echo "dev-build/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use + if [[ ${CHOST} == *-solaris* ]] ; then + # avoid complexities with the host toolchain + sed -i -e '/^sys-devel\/gcc pie$/d' \ + "${PORTDIR}"/profiles/base/package.use.force + echo "sys-devel/gcc -pie" >> "${ROOT}"/tmp/etc/portage/package.use + fi + emerge_pkgs --nodeps "${pkgs[@]}" || return 1 # Debian multiarch supported by RAP needs ld to support sysroot.