From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-886085-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id A80B713829C
	for <garchives@archives.gentoo.org>; Wed,  8 Jun 2016 01:11:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id D2097254020;
	Wed,  8 Jun 2016 01:11:02 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 3AC06254020
	for <gentoo-commits@lists.gentoo.org>; Wed,  8 Jun 2016 01:11:02 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A35AE340D49
	for <gentoo-commits@lists.gentoo.org>; Wed,  8 Jun 2016 01:11:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id F053195D
	for <gentoo-commits@lists.gentoo.org>; Wed,  8 Jun 2016 01:10:57 +0000 (UTC)
From: "Benda XU" <heroxbd@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, "Benda XU" <heroxbd@gentoo.org>
Message-ID: <1465223711.42cc3c6a762fd3d5dcb15cab5f194b1ccdc0d709.heroxbd@gentoo>
Subject: [gentoo-commits] repo/proj/prefix:rap0 commit in: scripts/
X-VCS-Repository: repo/proj/prefix
X-VCS-Files: scripts/bootstrap-prefix.sh
X-VCS-Directories: scripts/
X-VCS-Committer: heroxbd
X-VCS-Committer-Name: Benda XU
X-VCS-Revision: 42cc3c6a762fd3d5dcb15cab5f194b1ccdc0d709
X-VCS-Branch: rap0
Date: Wed,  8 Jun 2016 01:10:57 +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: 4bcfeba1-4b7c-4323-ada9-d97a2ac57fea
X-Archives-Hash: 7ef414c265475e5ddea5441944caab75

commit:     42cc3c6a762fd3d5dcb15cab5f194b1ccdc0d709
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 14:35:11 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 14:35:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=42cc3c6a

scripts/bootstrap-prefix.sh: EPREFIX/bin/sh link to bash

  Otherwise EPREFIX/tmp/bin/sh somehow stops working
  sh: error while loading shared libraries: libncurses.so.6

  https://bugs.gentoo.org/show_bug.cgi?id=575480#c12

 scripts/bootstrap-prefix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8d295ed..47138a8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -543,7 +543,7 @@ bootstrap_portage() {
 	[[ -x ${ROOT}/tmp/bin/bash ]] || ln -s "${BASH}" "${ROOT}"/tmp/bin/bash || return 1
 	[[ -x ${ROOT}/tmp/bin/sh ]] || ln -s bash "${ROOT}"/tmp/bin/sh || return 1
 	[[ -x ${ROOT}/bin/bash ]] || ln -s ../tmp/bin/bash "${ROOT}"/bin/bash || return 1
-	[[ -x ${ROOT}/bin/sh ]] || ln -s ../tmp/bin/sh "${ROOT}"/bin/sh || return 1
+	[[ -x ${ROOT}/bin/sh ]] || ln -s bash "${ROOT}"/bin/sh || return 1
 	export PORTAGE_BASH="${ROOT}"/tmp/bin/bash
 
 	einfo "Compiling ${A%-*}"