From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 503C3138350 for ; Wed, 12 Feb 2020 12:16:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95F03E0844; Wed, 12 Feb 2020 12:16:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 809CFE0844 for ; Wed, 12 Feb 2020 12:16:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F92F34EB82 for ; Wed, 12 Feb 2020 12:16:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C91FC12F for ; Wed, 12 Feb 2020 12:16:34 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1581509751.0e74313ccdf8a00d796f76583a3aece6cf4beb05.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/features/prefix/standalone/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/features/prefix/standalone/profile.bashrc X-VCS-Directories: profiles/features/prefix/standalone/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 0e74313ccdf8a00d796f76583a3aece6cf4beb05 X-VCS-Branch: master Date: Wed, 12 Feb 2020 12:16:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4b7080f8-087e-4769-a6ff-1a64bd4961c2 X-Archives-Hash: 30e91f4e21c7235bab20cfd9283c7c24 commit: 0e74313ccdf8a00d796f76583a3aece6cf4beb05 Author: Benda Xu gentoo org> AuthorDate: Wed Feb 12 12:13:09 2020 +0000 Commit: Benda XU gentoo org> CommitDate: Wed Feb 12 12:15:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e74313c 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 gentoo.org> profiles/features/prefix/standalone/profile.bashrc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc index 20a3aff74cf..49293adb98d 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}"