From: Khem Raj <raj.k...@gmail.com>
Signed-off-by: Khem Raj <raj.k...@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceres...@bootlin.com>
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
(cherry picked from commit 02fd8e760cac1d2e0e25a4e3dbea3f2844b9fd01)
Signed-off-by: Steve Sakoman <st...@sakoman.com>
---
meta/recipes-core/musl/musl_git.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/musl/musl_git.bb
b/meta/recipes-core/musl/musl_git.bb
index 044ed9c064..4b85401360 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -49,7 +49,7 @@ CONFIGUREOPTS = " \
--bindir=${bindir} \
--libdir=${libdir} \
--includedir=${includedir} \
- --syslibdir=/lib \
+ --syslibdir=${nonarch_base_libdir} \
"
do_configure() {
@@ -62,14 +62,14 @@ do_compile() {
do_install() {
oe_runmake install DESTDIR='${D}'
- install -d ${D}${bindir} ${D}/lib ${D}${sysconfdir}
+ install -d ${D}${bindir} ${D}${sysconfdir}
echo "${base_libdir}" >
${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path
echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path
rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO}
ln -rs ${D}${libdir}/libc.so ${D}${bindir}/ldd
}
-FILES:${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1
${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path"
+FILES:${PN} += "${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1
${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path"
FILES:${PN}-staticdev = "${libdir}/libc.a"
FILES:${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \
${libdir}/libpthread.a ${libdir}/libresolv.a \
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#165032):
https://lists.openembedded.org/g/openembedded-core/message/165032
Mute This Topic: https://lists.openembedded.org/mt/90779154/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
