| 1 |
commit: 668244297775b0857de355dc77c6cfe2db1fc7c4 |
| 2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Sat Sep 24 14:12:06 2016 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 24 20:15:19 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66824429 |
| 7 |
|
| 8 |
sys-libs/musl: add sanity check for ldconfig arch |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/musl/musl-1.1.15-r1.ebuild | 1 + |
| 13 |
sys-libs/musl/musl-9999.ebuild | 1 + |
| 14 |
2 files changed, 2 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sys-libs/musl/musl-1.1.15-r1.ebuild b/sys-libs/musl/musl-1.1.15-r1.ebuild |
| 17 |
index ae82136..be22eba 100644 |
| 18 |
--- a/sys-libs/musl/musl-1.1.15-r1.ebuild |
| 19 |
+++ b/sys-libs/musl/musl-1.1.15-r1.ebuild |
| 20 |
@@ -92,6 +92,7 @@ src_install() { |
| 21 |
|
| 22 |
if [[ ${CATEGORY} != cross-* ]] ; then |
| 23 |
local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p') |
| 24 |
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die |
| 25 |
cp "${FILESDIR}"/ldconfig.in "${T}" || die |
| 26 |
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die |
| 27 |
into / |
| 28 |
|
| 29 |
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild |
| 30 |
index ae82136..be22eba 100644 |
| 31 |
--- a/sys-libs/musl/musl-9999.ebuild |
| 32 |
+++ b/sys-libs/musl/musl-9999.ebuild |
| 33 |
@@ -92,6 +92,7 @@ src_install() { |
| 34 |
|
| 35 |
if [[ ${CATEGORY} != cross-* ]] ; then |
| 36 |
local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p') |
| 37 |
+ [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die |
| 38 |
cp "${FILESDIR}"/ldconfig.in "${T}" || die |
| 39 |
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die |
| 40 |
into / |
Archives