| 1 |
commit: 0fcf2e327095c1329a4044950cadfda036db8245 |
| 2 |
Author: Marty E. Plummer <hanetzer <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Fri Dec 29 11:02:09 2017 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 29 18:21:44 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fcf2e32 |
| 7 |
|
| 8 |
sys-libs/musl: prefixify build |
| 9 |
|
| 10 |
Currently building a musl libc toolchain inside of gentoo prefix with |
| 11 |
crossdev will fail, due to installing files outside of the prefix. Added |
| 12 |
${EPREFIX} and ${ED} where apropriate fixed this issue. |
| 13 |
|
| 14 |
Tested in a prefix with toolchain x86_64-gentoo-linux-musl, and tested on bare |
| 15 |
gentoo with x86_64-gentoo-linux-musl. |
| 16 |
|
| 17 |
Acked-by: blueness |
| 18 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 19 |
Signed-off-by: Marty E. Plummer <hanetzer <AT> protonmail.com> |
| 20 |
|
| 21 |
Closes: https://bugs.gentoo.org/642612 |
| 22 |
Closes: https://github.com/gentoo/gentoo/pull/6678 |
| 23 |
|
| 24 |
sys-libs/musl/{musl-9999.ebuild => musl-1.1.18-r1.ebuild} | 4 ++-- |
| 25 |
sys-libs/musl/musl-9999.ebuild | 4 ++-- |
| 26 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 27 |
|
| 28 |
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.1.18-r1.ebuild |
| 29 |
similarity index 96% |
| 30 |
copy from sys-libs/musl/musl-9999.ebuild |
| 31 |
copy to sys-libs/musl/musl-1.1.18-r1.ebuild |
| 32 |
index 9e0e184d656..c4a1c90aaf5 100644 |
| 33 |
--- a/sys-libs/musl/musl-9999.ebuild |
| 34 |
+++ b/sys-libs/musl/musl-1.1.18-r1.ebuild |
| 35 |
@@ -59,7 +59,7 @@ src_configure() { |
| 36 |
just_headers && export CC=true |
| 37 |
|
| 38 |
local sysroot |
| 39 |
- is_crosscompile && sysroot=/usr/${CTARGET} |
| 40 |
+ is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET} |
| 41 |
./configure \ |
| 42 |
--target=${CTARGET} \ |
| 43 |
--prefix=${sysroot}/usr \ |
| 44 |
@@ -88,7 +88,7 @@ src_install() { |
| 45 |
# musl provides ldd via a sym link to its ld.so |
| 46 |
local sysroot |
| 47 |
is_crosscompile && sysroot=/usr/${CTARGET} |
| 48 |
- local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) |
| 49 |
+ local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*) |
| 50 |
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd |
| 51 |
|
| 52 |
if [[ ${CATEGORY} != cross-* ]] ; then |
| 53 |
|
| 54 |
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild |
| 55 |
index 9e0e184d656..c4a1c90aaf5 100644 |
| 56 |
--- a/sys-libs/musl/musl-9999.ebuild |
| 57 |
+++ b/sys-libs/musl/musl-9999.ebuild |
| 58 |
@@ -59,7 +59,7 @@ src_configure() { |
| 59 |
just_headers && export CC=true |
| 60 |
|
| 61 |
local sysroot |
| 62 |
- is_crosscompile && sysroot=/usr/${CTARGET} |
| 63 |
+ is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET} |
| 64 |
./configure \ |
| 65 |
--target=${CTARGET} \ |
| 66 |
--prefix=${sysroot}/usr \ |
| 67 |
@@ -88,7 +88,7 @@ src_install() { |
| 68 |
# musl provides ldd via a sym link to its ld.so |
| 69 |
local sysroot |
| 70 |
is_crosscompile && sysroot=/usr/${CTARGET} |
| 71 |
- local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) |
| 72 |
+ local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*) |
| 73 |
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd |
| 74 |
|
| 75 |
if [[ ${CATEGORY} != cross-* ]] ; then |
Archives