| 1 |
commit: a9b1dd3546c9849e5e342d246bdddea95c00dd2a |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 20 22:06:40 2020 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 20 22:12:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b1dd35 |
| 7 |
|
| 8 |
sys-libs/musl: extract $(ARCH)$(SUBARCH) from config.mak |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/642612 |
| 11 |
Closes: https://bugs.gentoo.org/645626 |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 14 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 15 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 16 |
|
| 17 |
sys-libs/musl/musl-1.1.24.ebuild | 6 +++++- |
| 18 |
sys-libs/musl/musl-1.2.0.ebuild | 6 +++++- |
| 19 |
sys-libs/musl/musl-9999.ebuild | 6 +++++- |
| 20 |
3 files changed, 15 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild |
| 23 |
index 7948e4dbf5b..453281e19f2 100644 |
| 24 |
--- a/sys-libs/musl/musl-1.1.24.ebuild |
| 25 |
+++ b/sys-libs/musl/musl-1.1.24.ebuild |
| 26 |
@@ -98,7 +98,11 @@ src_install() { |
| 27 |
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd |
| 28 |
|
| 29 |
if [[ ${CATEGORY} != cross-* ]] ; then |
| 30 |
- local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p') |
| 31 |
+ # Fish out of config: |
| 32 |
+ # ARCH = ... |
| 33 |
+ # SUBARCH = ... |
| 34 |
+ # and print $(ARCH)$(SUBARCH). |
| 35 |
+ local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak) |
| 36 |
[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die |
| 37 |
cp "${FILESDIR}"/ldconfig.in "${T}" || die |
| 38 |
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die |
| 39 |
|
| 40 |
diff --git a/sys-libs/musl/musl-1.2.0.ebuild b/sys-libs/musl/musl-1.2.0.ebuild |
| 41 |
index e33c6c80913..6aab4a0a5ec 100644 |
| 42 |
--- a/sys-libs/musl/musl-1.2.0.ebuild |
| 43 |
+++ b/sys-libs/musl/musl-1.2.0.ebuild |
| 44 |
@@ -98,7 +98,11 @@ src_install() { |
| 45 |
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd |
| 46 |
|
| 47 |
if [[ ${CATEGORY} != cross-* ]] ; then |
| 48 |
- local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p') |
| 49 |
+ # Fish out of config: |
| 50 |
+ # ARCH = ... |
| 51 |
+ # SUBARCH = ... |
| 52 |
+ # and print $(ARCH)$(SUBARCH). |
| 53 |
+ local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak) |
| 54 |
[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die |
| 55 |
cp "${FILESDIR}"/ldconfig.in "${T}" || die |
| 56 |
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die |
| 57 |
|
| 58 |
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild |
| 59 |
index 50beaf64e1a..dc422c9426b 100644 |
| 60 |
--- a/sys-libs/musl/musl-9999.ebuild |
| 61 |
+++ b/sys-libs/musl/musl-9999.ebuild |
| 62 |
@@ -98,7 +98,11 @@ src_install() { |
| 63 |
dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd |
| 64 |
|
| 65 |
if [[ ${CATEGORY} != cross-* ]] ; then |
| 66 |
- local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p') |
| 67 |
+ # Fish out of config: |
| 68 |
+ # ARCH = ... |
| 69 |
+ # SUBARCH = ... |
| 70 |
+ # and print $(ARCH)$(SUBARCH). |
| 71 |
+ local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak) |
| 72 |
[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die |
| 73 |
cp "${FILESDIR}"/ldconfig.in "${T}" || die |
| 74 |
sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die |
Archives