From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-994491-garchives=archives.gentoo.org@lists.gentoo.org>
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 D1B4F138206
	for <garchives@archives.gentoo.org>; Tue,  2 Jan 2018 16:27:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 11B22E0857;
	Tue,  2 Jan 2018 16:27:38 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 D18BBE0857
	for <gentoo-commits@lists.gentoo.org>; Tue,  2 Jan 2018 16:27:37 +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 B6B4F335C07
	for <gentoo-commits@lists.gentoo.org>; Tue,  2 Jan 2018 16:27:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D8A412D
	for <gentoo-commits@lists.gentoo.org>; Tue,  2 Jan 2018 16:27:35 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
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" <grobian@gentoo.org>
Message-ID: <1514910414.dae1cff11a36860ac0ddd1ae18cd02daec894c8a.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: dae1cff11a36860ac0ddd1ae18cd02daec894c8a
X-VCS-Branch: master
Date: Tue,  2 Jan 2018 16:27:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: f3052076-2d45-45c7-8e31-9d8eac7d614d
X-Archives-Hash: 47e097328d738d8a61b97cc1c850be4e

commit:     dae1cff11a36860ac0ddd1ae18cd02daec894c8a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 16:26:54 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 16:26:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dae1cff1

scripts/bootstrap-prefix.sh: change Darwin bootstrap to use clang5

changes by Michael Weiser

Bug: https://bugs.gentoo.org/642656

 scripts/bootstrap-prefix.sh | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5c7ec7bd45..6b928c2f83 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -178,14 +178,6 @@ configure_toolchain() {
 	  )
 	esac
 
-	# unfortunately, gmp needs c++, thus libcxx, so have to drag
-	# it in early (gmp is necessary for >3.5)
-	local cdep="3.5.9999"
-	local libcxx="
-		<sys-libs/libcxx-headers-${cdep}
-		<sys-libs/libcxxabi-${cdep}
-		<sys-libs/libcxx-${cdep}"
-
 	CC=gcc
 	CXX=g++
 	llvm_deps="
@@ -219,7 +211,8 @@ configure_toolchain() {
 								${llvm_deps}
 								sys-devel/llvm
 								sys-devel/clang
-								${libcxx}"
+								sys-libs/libcxxabi
+								sys-libs/libcxx"
 							;;
 					esac
 					CC=clang
@@ -249,12 +242,17 @@ configure_toolchain() {
 			if [[ ${mycc} == gcc ]] ; then
 				# The deps for 3.6+ are too high (cmake, ninja, python) so
 				# we have to install this with an intermediate
+				# unfortunately, gmp needs c++, thus libcxx, so have to drag
+				# it in early (gmp is necessary for >3.5)
 				# we always have to bootstrap with 3.4 for else we'd need
 				# libcxx, which only compiles with clang
+				local cdep="3.5.9999"
 				compiler_stage1+="
 					dev-libs/libffi
 					<sys-devel/llvm-3.5
-					${libcxx}
+					<sys-libs/libcxx-headers-${cdep}
+					<sys-libs/libcxxabi-${cdep}
+					<sys-libs/libcxx-${cdep}
 					<sys-devel/llvm-${cdep}
 					<sys-devel/clang-${cdep}"
 			fi
@@ -263,7 +261,8 @@ configure_toolchain() {
 				sys-libs/csu
 				dev-libs/libffi
 				${llvm_deps}
-				${libcxx}
+				sys-libs/libcxxabi
+				sys-libs/libcxx
 				sys-devel/llvm
 				sys-devel/clang"
 			;;
@@ -1453,6 +1452,7 @@ bootstrap_stage2() {
 
 	BOOTSTRAP_RAP_STAGE2=yes \
 	EXTRA_ECONF="--disable-bootstrap" \
+	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 	GCC_MAKE_TARGET=all \
 	TPREFIX="${ROOT}" \
 	PYTHON_COMPAT_OVERRIDE=python2.7 \
@@ -1520,7 +1520,7 @@ bootstrap_stage3() {
 		# stage3 tools should be used first.
 		# PORTAGE_TMPDIR, EMERGE_LOG_DIR, FEATURES=force-prefix are
 		# needed with host portage.
-		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{,usr/}{s,}bin | sed "s, ,:${ROOT},g") \
+		PREROOTPATH="${ROOT}"$(echo /{,tmp/}{,usr/}{,lib/llvm/5/}{s,}bin | sed "s, ,:${ROOT},g") \
 		EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
 		FEATURES="${FEATURES} force-prefix" \
 		EMERGE_LOG_DIR="${ROOT}"/var/log \
@@ -1604,6 +1604,7 @@ bootstrap_stage3() {
 	RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9])
 	# try to get ourself out of the mudd, bug #575324
 	EXTRA_ECONF="--disable-compiler-version-checks $(rapx --disable-lto)" \
+	MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \
 	LDFLAGS="${LDFLAGS} $(rapx -Wl,--dynamic-linker=${RAP_DLINKER})" \
 	PYTHON_COMPAT_OVERRIDE=python2.7 \
 	emerge_pkgs --nodeps ${compiler} || return 1