diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2020-02-12 20:13:09 +0800 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2020-02-12 20:15:51 +0800 |
| commit | 0e74313ccdf8a00d796f76583a3aece6cf4beb05 (patch) | |
| tree | 10f8ba3e88c92fbabe04907e6fef94397af52b5d | |
| parent | sys-kernel/gentoo-kernel-bin: Bump to 4.19.103 (diff) | |
| download | gentoo-0e74313ccdf8a00d796f76583a3aece6cf4beb05.tar.gz gentoo-0e74313ccdf8a00d796f76583a3aece6cf4beb05.tar.bz2 gentoo-0e74313ccdf8a00d796f76583a3aece6cf4beb05.zip | |
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>
| -rw-r--r-- | profiles/features/prefix/standalone/profile.bashrc | 9 |
1 files changed, 8 insertions, 1 deletions
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}" |