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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 07C1E138334 for ; Thu, 13 Dec 2018 07:50:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FF18E08BD; Thu, 13 Dec 2018 07:50:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E41F9E08BD for ; Thu, 13 Dec 2018 07:50:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 89973335C94 for ; Thu, 13 Dec 2018 07:50:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CF4443A for ; Thu, 13 Dec 2018 07:50:43 +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: <1544687425.e477fc65969ca0841cb8bca657bc364a2e5ba965.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: e477fc65969ca0841cb8bca657bc364a2e5ba965 X-VCS-Branch: master Date: Thu, 13 Dec 2018 07:50:43 +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: 02cd6706-b0ca-410e-8e64-0ac79bbdc3c7 X-Archives-Hash: 3d438b96c7fb704029c4fe79f6dac8ea commit: e477fc65969ca0841cb8bca657bc364a2e5ba965 Author: Fabian Groffen gentoo org> AuthorDate: Thu Dec 13 07:50:25 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Dec 13 07:50:25 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e477fc65 scripts/bootstrap-prefix: apply masks before emerging Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 9335fb6661..9e08be65f6 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1543,16 +1543,14 @@ bootstrap_stage2() { sys-devel/binutils-config ) - emerge_pkgs --nodeps "${pkgs[@]}" || return 1 - - # Debian multiarch supported by RAP needs ld to support sysroot. - EXTRA_ECONF=$(rapx --with-sysroot=/) \ - emerge_pkgs --nodeps ${linker} || return 1 - # Old versions of gcc has been masked. We need gcc-4.7 to bootstrap # on systems without a c++ compiler. echo '> "${ROOT}"/tmp/etc/portage/package.unmask - + + # libffi-3.0_rc0 has broken Solaris ld support, which we still + # use at this stage (host compiler) + [[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" \ + >> "${ROOT}"/tmp/etc/portage/package.mask # kill some dependencies here while we're still fragile { @@ -1567,11 +1565,14 @@ bootstrap_stage2() { echo "sys-apps/help2man -nls" # avoid hefty set of deps from glib echo "dev-util/pkgconfig internal-glib" - # libffi-3.0_rc0 has broken Solaris ld support, which we still - # use at this stage (host compiler) - [[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" } >> "${ROOT}"/tmp/etc/portage/package.use + emerge_pkgs --nodeps "${pkgs[@]}" || return 1 + + # Debian multiarch supported by RAP needs ld to support sysroot. + EXTRA_ECONF=$(rapx --with-sysroot=/) \ + emerge_pkgs --nodeps ${linker} || return 1 + for pkg in ${compiler_stage1} ; do #