From: Benda Xu <heroxbd@gentoo.org>
Date: Wed, 12 Feb 2020 12:13:09 +0000 (+0800)
Subject: p/f/prefix/s/profile.bashrc: new location of emultempl/elf32.em.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0e74313ccdf8a00d796f76583a3aece6cf4beb05;p=gentoo.git

p/f/prefix/s/profile.bashrc: new location of emultempl/elf32.em.

  From binutils-2.34, /etc/ld.so.conf is coded in ld/ldelf.c instead.

Closes: https://bugs.gentoo.org/708184
Signed-off-by: Benda Xu <heroxbd@gentoo.org>
---

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}"