diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-04-21 21:05:51 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-22 23:40:16 +0100 |
| commit | 02fd8e760cac1d2e0e25a4e3dbea3f2844b9fd01 (patch) | |
| tree | aebb2278fbb23d113b7abc5af951af6ff45ec64d /meta/recipes-core/musl | |
| parent | c6d508157058adae401059e36df7fa778852859b (diff) | |
| download | openembedded-core-02fd8e760cac1d2e0e25a4e3dbea3f2844b9fd01.tar.gz | |
musl: Fix build when usrmerge distro feature is enabled
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/musl')
| -rw-r--r-- | meta/recipes-core/musl/musl_git.bb | 6 |
1 files 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 \ |