From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E7AD858973 for ; Sun, 24 Jan 2016 19:12:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7014421C00B; Sun, 24 Jan 2016 19:12:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0831121C00B for ; Sun, 24 Jan 2016 19:12:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 20737340691 for ; Sun, 24 Jan 2016 19:12:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAF65C0 for ; Sun, 24 Jan 2016 19:12:16 +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: <1453662731.9747bcfdfc18c635608d848825b75bec7f05db67.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: 9747bcfdfc18c635608d848825b75bec7f05db67 X-VCS-Branch: master Date: Sun, 24 Jan 2016 19:12:16 +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-Archives-Salt: e2616958-b31f-423f-8eec-1df8ef0701e8 X-Archives-Hash: d433d880b773d9ecee2d705b9d66ed50 commit: 9747bcfdfc18c635608d848825b75bec7f05db67 Author: Fabian Groffen gentoo org> AuthorDate: Sun Jan 24 19:12:11 2016 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Jan 24 19:12:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9747bcfd scripts/bootstrap-prefix: cleanup temp python2.7 symlink to avoid collisions with the real python2.7 scripts/bootstrap-prefix.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index de47ee2..c47dd13 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1214,10 +1214,11 @@ bootstrap_stage3() { # Clang unconditionally requires python, the eclasses are really not # setup for a scenario where python doesn't live in the target # prefix and no helpers are available - ( cd "${ROOT}"/usr/bin && test ! -e python2.7 && test ! -e python && ln -s "${ROOT}"/tmp/usr/bin/python2.7 ) + ( cd "${ROOT}"/usr/bin && test ! -e python && ln -s "${ROOT}"/tmp/usr/bin/python2.7 ) # in addition, avoid collisions rm -Rf "${ROOT}"/tmp/usr/lib/python2.7/site-packages/clang emerge_pkgs --nodeps ${compiler} || return 1 + ( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python2.7 ) # Use $ROOT tools where possible from now on. rm -f "${ROOT}"/bin/sh