diff options
| author |   Jan Kaisrlik <ja.kaisrlik@gmail.com> | 2020-03-13 12:44:51 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-13 23:00:42 +0000 |
| commit | 8d068bd3adec64d451cf9cd4ae6b0803a7152463 (patch) | |
| tree | 3e68795bdfedc7258b9f6805d2695e1831f233ee /meta/recipes-core/musl | |
| parent | b1ae2178fa188b2864280f2c3a9ba443e042cae0 (diff) | |
| download | openembedded-core-contrib-8d068bd3adec64d451cf9cd4ae6b0803a7152463.tar.gz | |
musl: removes aliases for glibc provided libraries
Based on the recommendation in musl mailing list[1] All symlinks have
been removed from musl recipe.
Move stub libraries into -dev package
having them treated as normal .a which they are not, is not correct and
packages shoves them into static archives, which are not installed on
target usually unless asked for
this should help in linking with -lm, -lpthread etc. on target
[1]: https://www.openwall.com/lists/musl/2020/03/10/11
Signed-off-by: Jan Kaisrlik <ja.kaisrlik@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.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 | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index afc8446547..2a15a78cd5 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -66,27 +66,20 @@ do_install() { rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO} - for l in crypt dl m pthread resolv rt util xnet - do - ln -sf libc.so ${D}${libdir}/lib$l.so - done - for i in libc.so.6 libcrypt.so.1 libdl.so.2 libm.so.6 libpthread.so.0 libresolv.so.2 librt.so.1 libutil.so.1; do - ln -sf libc.so ${D}${libdir}/$i - done } PACKAGES =+ "${PN}-glibc-compat" -FILES_${PN}-glibc-compat += "\ - ${libdir}/libc.so.6 ${libdir}/libcrypt.so.1 \ - ${libdir}/libdl.so.2 ${libdir}/libm.so.6 \ - ${libdir}/libpthread.so.0 ${libdir}/libresolv.so.2 \ - ${libdir}/librt.so.1 ${libdir}/libutil.so.1 \ - ${GLIBC_LDSO} \ - " +FILES_${PN}-glibc-compat += "${GLIBC_LDSO}" +FILES_${PN}-staticdev = "${libdir}/libc.a" +FILES_${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ + ${libdir}/libpthread.a ${libdir}/libresolv.a \ + ${libdir}/librt.a ${libdir}/libutil.a ${libdir}/libxnet.a \ + " RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" RPROVIDES_${PN} += "ldd libsegfault rtld(GNU_HASH)" LEAD_SONAME = "libc.so" +INSANE_SKIP_${PN}-dev = "staticdev" |