diff options
author | James Le Cuirot <chewi@gentoo.org> | 2023-02-09 23:04:15 +0000 |
---|---|---|
committer | James Le Cuirot <chewi@gentoo.org> | 2023-02-11 22:27:24 +0000 |
commit | 80d8703c52f23ca672a0e690f9daa4aff6520ee1 (patch) | |
tree | 26dacb8d04db063ab65cd91e16ab9cb4dfe406e4 /profiles/features | |
parent | sys-apps/util-linux: remove obsolete fallocate test (diff) | |
download | gentoo-80d8703c52f23ca672a0e690f9daa4aff6520ee1.tar.gz gentoo-80d8703c52f23ca672a0e690f9daa4aff6520ee1.tar.bz2 gentoo-80d8703c52f23ca672a0e690f9daa4aff6520ee1.zip |
profiles: Don't prefixify /etc/ld.so.conf path in binutils
Now that the compiler's sysroot is being respected, prefixifying the
path to /etc/ld.so.conf results in a double prefix.
Bug: https://bugs.gentoo.org/892549
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'profiles/features')
-rw-r--r-- | profiles/features/prefix/standalone/profile.bashrc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc index d46933210dcc..8c500da85519 100644 --- a/profiles/features/prefix/standalone/profile.bashrc +++ b/profiles/features/prefix/standalone/profile.bashrc @@ -14,16 +14,6 @@ if [[ ${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" - 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} == configure ]]; then cd "${S}" einfo "Prefixifying hardcoded path" |