commit: 80d8703c52f23ca672a0e690f9daa4aff6520ee1 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Feb 9 23:04:15 2023 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Feb 11 22:27:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d8703c
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 <AT> gentoo.org> profiles/features/prefix/standalone/profile.bashrc | 10 ---------- 1 file changed, 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"
