diff options
| author |   David Seifert <soap@gentoo.org> | 2020-02-09 22:31:09 -0600 |
|---|---|---|
| committer |   William Hubbs <williamh@gentoo.org> | 2020-02-09 22:31:09 -0600 |
| commit | b4e246839d42a3c9a839801759c20f69c27df964 (patch) | |
| tree | ab1a63610c9e3d844f2077c56095d4f781301d47 /sys-apps/baselayout | |
| parent | sys-apps/systemd: amd64 stable (diff) | |
| download | gentoo-b4e246839d42a3c9a839801759c20f69c27df964.tar.gz gentoo-b4e246839d42a3c9a839801759c20f69c27df964.tar.bz2 gentoo-b4e246839d42a3c9a839801759c20f69c27df964.zip | |
sys-apps/baselayout: Remove symlinked components when USE="-split-usr"
Closes: https://bugs.gentoo.org/708698
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: William Hubbs <williamh@gentoo.org>
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/baselayout-9999.ebuild | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index 274767b5eab0..a4b8ca535ac9 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -188,6 +188,16 @@ src_prepare() { echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host fi + # don't want symlinked directories in PATH on systems with usr-merge + if ! use split-usr; then + sed \ + -e 's|/usr/local/sbin:||g' \ + -e 's|:/usr/sbin:|:|g' \ + -e 's|:/sbin:|:|g' \ + -e 's|:/bin:|:|g' \ + -i etc/env.d/50baselayout || die + fi + # handle multilib paths. do it here because we want this behavior # regardless of the C library that you're using. we do explicitly # list paths which the native ldconfig searches, but this isn't @@ -196,7 +206,8 @@ src_prepare() { # path and the symlinked path doesn't change the resulting cache. local libdir ldpaths for libdir in $(get_all_libdirs) ; do - ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}" + use split-usr && ldpaths+=":${EPREFIX}/${libdir}" + ldpaths+=":${EPREFIX}/usr/${libdir}" ldpaths+=":${EPREFIX}/usr/local/${libdir}" done echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout |