| 1 |
commit: b4e246839d42a3c9a839801759c20f69c27df964 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 10 04:31:09 2020 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 10 04:31:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e24683 |
| 7 |
|
| 8 |
sys-apps/baselayout: Remove symlinked components when USE="-split-usr" |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/708698 |
| 11 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
| 12 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-apps/baselayout/baselayout-9999.ebuild | 15 +++++++++++++-- |
| 15 |
1 file changed, 13 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild |
| 18 |
index 274767b5eab..a4b8ca535ac 100644 |
| 19 |
--- a/sys-apps/baselayout/baselayout-9999.ebuild |
| 20 |
+++ b/sys-apps/baselayout/baselayout-9999.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2019 Gentoo Authors |
| 23 |
+# Copyright 1999-2020 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
@@ -188,6 +188,16 @@ src_prepare() { |
| 28 |
echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host |
| 29 |
fi |
| 30 |
|
| 31 |
+ # don't want symlinked directories in PATH on systems with usr-merge |
| 32 |
+ if ! use split-usr; then |
| 33 |
+ sed \ |
| 34 |
+ -e 's|/usr/local/sbin:||g' \ |
| 35 |
+ -e 's|:/usr/sbin:|:|g' \ |
| 36 |
+ -e 's|:/sbin:|:|g' \ |
| 37 |
+ -e 's|:/bin:|:|g' \ |
| 38 |
+ -i etc/env.d/50baselayout || die |
| 39 |
+ fi |
| 40 |
+ |
| 41 |
# handle multilib paths. do it here because we want this behavior |
| 42 |
# regardless of the C library that you're using. we do explicitly |
| 43 |
# list paths which the native ldconfig searches, but this isn't |
| 44 |
@@ -196,7 +206,8 @@ src_prepare() { |
| 45 |
# path and the symlinked path doesn't change the resulting cache. |
| 46 |
local libdir ldpaths |
| 47 |
for libdir in $(get_all_libdirs) ; do |
| 48 |
- ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}" |
| 49 |
+ use split-usr && ldpaths+=":${EPREFIX}/${libdir}" |
| 50 |
+ ldpaths+=":${EPREFIX}/usr/${libdir}" |
| 51 |
ldpaths+=":${EPREFIX}/usr/local/${libdir}" |
| 52 |
done |
| 53 |
echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout |
Archives