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 99670138AE9 for ; Fri, 29 Dec 2017 18:22:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9672E0E93; Fri, 29 Dec 2017 18:22:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 A530DE0E93 for ; Fri, 29 Dec 2017 18:22:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3E553340988 for ; Fri, 29 Dec 2017 18:22:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CAFFF9C2F for ; Fri, 29 Dec 2017 18:22:41 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1514571704.0fcf2e327095c1329a4044950cadfda036db8245.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/musl/musl-1.1.18-r1.ebuild sys-libs/musl/musl-9999.ebuild X-VCS-Directories: sys-libs/musl/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 0fcf2e327095c1329a4044950cadfda036db8245 X-VCS-Branch: master Date: Fri, 29 Dec 2017 18:22:41 +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-Archives-Salt: 16a11814-006f-48a9-a550-89210b48a8bf X-Archives-Hash: 7df3f6e1a00f9445fd3782b322cc00fc commit: 0fcf2e327095c1329a4044950cadfda036db8245 Author: Marty E. Plummer protonmail com> AuthorDate: Fri Dec 29 11:02:09 2017 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Dec 29 18:21:44 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fcf2e32 sys-libs/musl: prefixify build Currently building a musl libc toolchain inside of gentoo prefix with crossdev will fail, due to installing files outside of the prefix. Added ${EPREFIX} and ${ED} where apropriate fixed this issue. Tested in a prefix with toolchain x86_64-gentoo-linux-musl, and tested on bare gentoo with x86_64-gentoo-linux-musl. Acked-by: blueness Package-Manager: Portage-2.3.19, Repoman-2.3.6 Signed-off-by: Marty E. Plummer protonmail.com> Closes: https://bugs.gentoo.org/642612 Closes: https://github.com/gentoo/gentoo/pull/6678 sys-libs/musl/{musl-9999.ebuild => musl-1.1.18-r1.ebuild} | 4 ++-- sys-libs/musl/musl-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.1.18-r1.ebuild similarity index 96% copy from sys-libs/musl/musl-9999.ebuild copy to sys-libs/musl/musl-1.1.18-r1.ebuild index 9e0e184d656..c4a1c90aaf5 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-1.1.18-r1.ebuild @@ -59,7 +59,7 @@ src_configure() { just_headers && export CC=true local sysroot - is_crosscompile && sysroot=/usr/${CTARGET} + is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET} ./configure \ --target=${CTARGET} \ --prefix=${sysroot}/usr \ @@ -88,7 +88,7 @@ src_install() { # musl provides ldd via a sym link to its ld.so local sysroot is_crosscompile && sysroot=/usr/${CTARGET} - local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) + local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*) dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd if [[ ${CATEGORY} != cross-* ]] ; then diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 9e0e184d656..c4a1c90aaf5 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -59,7 +59,7 @@ src_configure() { just_headers && export CC=true local sysroot - is_crosscompile && sysroot=/usr/${CTARGET} + is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET} ./configure \ --target=${CTARGET} \ --prefix=${sysroot}/usr \ @@ -88,7 +88,7 @@ src_install() { # musl provides ldd via a sym link to its ld.so local sysroot is_crosscompile && sysroot=/usr/${CTARGET} - local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) + local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*) dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd if [[ ${CATEGORY} != cross-* ]] ; then