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 7B621138334 for ; Sun, 14 Jul 2019 09:01:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABD3FE07F2; Sun, 14 Jul 2019 09:01:30 +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 8D6ADE07F2 for ; Sun, 14 Jul 2019 09:01:30 +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 3401A3478B8 for ; Sun, 14 Jul 2019 09:01:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8DCF4D3 for ; Sun, 14 Jul 2019 09:01:26 +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: <1563094810.082de40aabef777138fd9a5dd0f7990bc5d68db2.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: 082de40aabef777138fd9a5dd0f7990bc5d68db2 X-VCS-Branch: master Date: Sun, 14 Jul 2019 09:01:26 +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: eb56df95-6849-4c92-95f8-88e3a78d1540 X-Archives-Hash: c98ff8ba0bacb94d43c26893910fad5f commit: 082de40aabef777138fd9a5dd0f7990bc5d68db2 Author: Fabian Groffen gentoo org> AuthorDate: Sun Jul 14 09:00:10 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Jul 14 09:00:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=082de40a scripts/bootstrap-prefix: add python2_7 for clang-based targets clang-6 (at least) needs python2, so re-add python2_7 to PYTHON_TARGETS if this package is going to be installed in stage2. 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 c6c0e1079d..888b620148 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -390,6 +390,13 @@ bootstrap_setup() { echo "USE=\"\${USE} ${MAKE_CONF_ADDITIONAL_USE}\"" [[ ${OFFLINE_MODE} ]] && \ echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""' + if [[ ${compiler_type} == clang ]] ; then + local ptrgs=$(sed -n 's/^PYTHON_TARGETS="\([^"]\+\)".*$/\1/' \ + "${PORTDIR}"/profiles/prefix/make.conf) + ptrgs=${ptrgs/-python2_7/} + echo "# python2 is required by sys-devel/clang-6" + echo "PYTHON_TARGETS=\"python2_7 ${ptrgs}\"" + fi } > "${ROOT}"/etc/portage/make.conf fi