[gentoo-commits] repo/proj/prefix:master commit in: scripts/

[Benda XU]

commit:     8e1dd215fb9401641e04199d1e69e7a5b498a7a3
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  1 10:17:37 2019 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jan  1 10:17:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8e1dd215

s/bootstrap-prefix.sh: no /bin symlinks in prefix/standalone.

  In prefix/standalone, we keep USE=split-usr enabled to align with
  the default of Gentoo vanilla.

Closes: https://bugs.gentoo.org/674084
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6af97eaba6..d393c4d498 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -503,14 +503,21 @@ do_tree() {
 	do
 		[[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}"
 	done
-	# We can make bin a symlink because /usr is never split, this is
+	# Make symlinks as USE=split-usr is masked in prefix/rpath. 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
+	#
+	# In prefix/standalone, however, no symlink is desired.
+	# Because we keep USE=split-usr enabled to align with the
+	# default of Gentoo vanilla.
+	if ! is-rap; then
+		for x in lib sbin bin; do
+			[[ -e ${ROOT}/${x} ]] || ( cd "${ROOT}" && ln -s usr/${x} )
+		done
+	fi
+
 	mkdir -p "${PORTDIR}"
 	if [[ ! -e ${PORTDIR}/.unpacked ]]; then
 		efetch "$1/$2" || return 1