diff options
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 = " \ | |||
49 | --bindir=${bindir} \ | 49 | --bindir=${bindir} \ |
50 | --libdir=${libdir} \ | 50 | --libdir=${libdir} \ |
51 | --includedir=${includedir} \ | 51 | --includedir=${includedir} \ |
52 | --syslibdir=/lib \ | 52 | --syslibdir=${nonarch_base_libdir} \ |
53 | " | 53 | " |
54 | 54 | ||
55 | do_configure() { | 55 | do_configure() { |
@@ -62,14 +62,14 @@ do_compile() { | |||
62 | 62 | ||
63 | do_install() { | 63 | do_install() { |
64 | oe_runmake install DESTDIR='${D}' | 64 | oe_runmake install DESTDIR='${D}' |
65 | install -d ${D}${bindir} ${D}/lib ${D}${sysconfdir} | 65 | install -d ${D}${bindir} ${D}${sysconfdir} |
66 | echo "${base_libdir}" > ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path | 66 | echo "${base_libdir}" > ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path |
67 | echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path | 67 | echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path |
68 | rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} | 68 | rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} |
69 | ln -rs ${D}${libdir}/libc.so ${D}${bindir}/ldd | 69 | ln -rs ${D}${libdir}/libc.so ${D}${bindir}/ldd |
70 | } | 70 | } |
71 | 71 | ||
72 | FILES:${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" | 72 | FILES:${PN} += "${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" |
73 | FILES:${PN}-staticdev = "${libdir}/libc.a" | 73 | FILES:${PN}-staticdev = "${libdir}/libc.a" |
74 | FILES:${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ | 74 | FILES:${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ |
75 | ${libdir}/libpthread.a ${libdir}/libresolv.a \ | 75 | ${libdir}/libpthread.a ${libdir}/libresolv.a \ |