summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJan Kaisrlik <ja.kaisrlik@gmail.com>2020-03-13 12:44:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-15 22:23:19 +0000
commit670e85a4a07b81a0b7114eb0b8f7c80b9307b653 (patch)
treed9175106d94098539b4c50face805bfde276b2be /meta
parent6a999ec1b589ab1d3619e0f08976fbdb860c3540 (diff)
downloadpoky-670e85a4a07b81a0b7114eb0b8f7c80b9307b653.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 (From OE-Core rev: 8d068bd3adec64d451cf9cd4ae6b0803a7152463) 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')
-rw-r--r--meta/recipes-core/musl/musl_git.bb21
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() {
66 rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} 66 rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO}
67 lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd 67 lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd
68 lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO} 68 lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO}
69 for l in crypt dl m pthread resolv rt util xnet
70 do
71 ln -sf libc.so ${D}${libdir}/lib$l.so
72 done
73 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
74 ln -sf libc.so ${D}${libdir}/$i
75 done
76} 69}
77 70
78PACKAGES =+ "${PN}-glibc-compat" 71PACKAGES =+ "${PN}-glibc-compat"
79 72
80FILES_${PN}-glibc-compat += "\ 73FILES_${PN}-glibc-compat += "${GLIBC_LDSO}"
81 ${libdir}/libc.so.6 ${libdir}/libcrypt.so.1 \ 74FILES_${PN}-staticdev = "${libdir}/libc.a"
82 ${libdir}/libdl.so.2 ${libdir}/libm.so.6 \ 75FILES_${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \
83 ${libdir}/libpthread.so.0 ${libdir}/libresolv.so.2 \ 76 ${libdir}/libpthread.a ${libdir}/libresolv.a \
84 ${libdir}/librt.so.1 ${libdir}/libutil.so.1 \ 77 ${libdir}/librt.a ${libdir}/libutil.a ${libdir}/libxnet.a \
85 ${GLIBC_LDSO} \ 78 "
86 "
87 79
88RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" 80RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev"
89RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" 81RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
90RPROVIDES_${PN} += "ldd libsegfault rtld(GNU_HASH)" 82RPROVIDES_${PN} += "ldd libsegfault rtld(GNU_HASH)"
91 83
92LEAD_SONAME = "libc.so" 84LEAD_SONAME = "libc.so"
85INSANE_SKIP_${PN}-dev = "staticdev"