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 09D0D138359 for ; Tue, 24 Nov 2020 09:48:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4451BE0828; Tue, 24 Nov 2020 09:48:03 +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 26092E0828 for ; Tue, 24 Nov 2020 09:48:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C1860335D30 for ; Tue, 24 Nov 2020 09:48:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 113A842F for ; Tue, 24 Nov 2020 09:48:00 +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: <1606211268.7a3cc78493b205c0ea11e8f6fe64d4e91ecbb55d.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: 7a3cc78493b205c0ea11e8f6fe64d4e91ecbb55d X-VCS-Branch: master Date: Tue, 24 Nov 2020 09:48:00 +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: 3f482ea5-f23b-42e0-a722-1d616953822e X-Archives-Hash: 02ec443b2e8ef0d7c8ad886d9dd98b92 commit: 7a3cc78493b205c0ea11e8f6fe64d4e91ecbb55d Author: Fabian Groffen gentoo org> AuthorDate: Tue Nov 24 09:44:13 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Nov 24 09:47:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7a3cc784 scripts/bootstrap-prefix: rework Xcode checks - don't require /usr/include (recent systems don't have it) - don't require CommandLineTools (any MacOSX.sdk will do) Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 497e35eadb..3224bb47b5 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -2472,20 +2472,17 @@ EOF fi if type -P xcode-select > /dev/null ; then - if [[ ! -d /usr/include ]] ; then - # bug #512032 - cat << EOF + if [[ -d /usr/include ]] ; then + # if we have /usr/include we're on an older system + if [[ ${CHOST} == powerpc* ]]; then + # ancient Xcode (3.0/3.1) + cat << EOF -You don't have /usr/include, this thwarts me to build stuff. -Please execute: - xcode-select --install -or install /usr/include in another way and try running me again. +Ok, this is an old system, let's just try and see what happens. EOF - exit 1 - fi - if [[ $(xcode-select -p) != */CommandLineTools ]] ; then - # to an extent, bug #564814 and bug #562800 - cat << EOF + elif [[ $(xcode-select -p) != */CommandLineTools ]] ; then + # to an extent, bug #564814 and bug #562800 + cat << EOF Your xcode-select is not set to CommandLineTools. This prevents builds from succeeding. Switch to command line tools for the bootstrap to @@ -2493,14 +2490,17 @@ continue. Please execute: xcode-select -s /Library/Developer/CommandLineTools and try running me again. EOF - if ! xcode-select -p > /dev/null && [[ ${CHOST} == powerpc* ]]; then - # ancient Xcode (3.0/3.1) + fi + else + # let's see if we have an xcode install + if [[ ! -e $(xcrun -f gcc 2>/dev/null) ]] ; then cat << EOF -Ok, this is an old system, let's just try and see what happens. +You don't have Xcode installed, or xcode-select isn't pointing to a +valid install. Try resetting it using: + sudo xcode-select -r +and try running me again. EOF - else - exit 1 fi fi fi