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 43EB3138252 for ; Thu, 12 May 2016 13:41:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1075E07D2; Thu, 12 May 2016 13:41:21 +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 4A851E07D2 for ; Thu, 12 May 2016 13:41:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 4DA8834098F for ; Thu, 12 May 2016 13:41:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50DA6968 for ; Thu, 12 May 2016 13:41:18 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1463060404.f6dfc2c7a792c6c5cc0b8d4b77a7349a0b156383.haubi@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: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: f6dfc2c7a792c6c5cc0b8d4b77a7349a0b156383 X-VCS-Branch: master Date: Thu, 12 May 2016 13:41:18 +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: e1dd935f-9508-48e8-9a3b-3bf2dd70f8f7 X-Archives-Hash: 783ebd4a5e1793b24f5fe6ee60a06366 commit: f6dfc2c7a792c6c5cc0b8d4b77a7349a0b156383 Author: Michael Haubenwallner ssi-schaefer com> AuthorDate: Thu May 12 12:53:56 2016 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Thu May 12 13:40:04 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f6dfc2c7 bootstrap-prefix.sh: symlink bin/ to usr/bin/ too Since coreutils does support /bin as symlink, we can create the bin -> usr/bin symlink as well. scripts/bootstrap-prefix.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index ad4de47..3377cb7 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -378,11 +378,14 @@ do_tree() { [[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}" done if [[ ${PREFIX_DISABLE_USR_SPLIT} == "yes" ]] ; then - # note to self: don't make bin a symlink to usr/bin for - # coreutils installs symlinks to from usr/bin to bin, which in - # case they are the same boils down to a pointless indirection - # to self - for x in lib sbin ; do + # note to self: since coreutils now listens to + # PREFIX_DISABLE_GEN_USR_LDSCRIPT to avoid symlinks + # from usr/bin to bin, we can make bin a symlink as well + # This is necessary for Cygwin, as there is no such thing + # like an embedded runpath. Instead we put all the dlls + # next to the exes, to get them working even without the + # PATH environment variable being set up. + for x in lib sbin bin; do [[ -e ${ROOT}/${x} ]] || ( cd "${ROOT}" && ln -s usr/${x} ) done else