commit: f6dfc2c7a792c6c5cc0b8d4b77a7349a0b156383
Author: Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer
<DOT> com>
AuthorDate: Thu May 12 12:53:56 2016 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> 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
