diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-17 01:16:38 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-17 01:16:38 +0000 |
| commit | 53cba99042fa967e2a93da9f8db806fe2d035543 (patch) | |
| tree | 9780d3b87dfc6bdebc6b7b7d15af1ecb813c6853 /profiles/features/prefix | |
| parent | 71deace00d1a2b091313fe137ab7092418c6f87c (diff) | |
gentoo resync : 17.02.2020
Diffstat (limited to 'profiles/features/prefix')
| -rw-r--r-- | profiles/features/prefix/package.mask | 3 | ||||
| -rw-r--r-- | profiles/features/prefix/standalone/profile.bashrc | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask index 808c71a894c3..4b5eef8c610b 100644 --- a/profiles/features/prefix/package.mask +++ b/profiles/features/prefix/package.mask @@ -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 # Benda Xu <heroxbd@gentoo.org> (2019-08-20) @@ -14,7 +14,6 @@ games-util/gamemode gnome-extra/gnome-logs gnome-extra/gnome-user-share gnome-extra/office-runner -kde-misc/systemd-kcm sys-apps/gentoo-systemd-integration sys-apps/systemd-readahead sys-process/systemd-cron diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc index 20a3aff74cf5..49293adb98d1 100644 --- a/profiles/features/prefix/standalone/profile.bashrc +++ b/profiles/features/prefix/standalone/profile.bashrc @@ -38,8 +38,15 @@ elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]] sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \ "${S}"/ld/configure.tgt eend $? + ebegin "Prefixifying path to /etc/ld.so.conf" - sed -i -r "s,\"/etc,\"${EPREFIX}/etc," "${S}"/ld/emultempl/elf32.em + local f= + if [[ -f "${S}"/ld/emultempl/elf32.em ]]; then + f="${S}"/ld/emultempl/elf32.em + elif [[ -f "${S}"/ld/ldelf.c ]]; then + f="${S}"/ld/ldelf.c + fi + [[ -n "${f}" ]] && sed -i -r "s,\"/etc,\"${EPREFIX}/etc," "${f}" eend $? elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == compile ]]; then cd "${S}" |