musl: removes aliases for glibc provided libraries
PATCH 1/1 musl: removes aliases for glibc provided libraries
From: Jan Kaisrlik <[email protected]>
Based on the recommendation in musl mailing list[1] All symlinks have been removed from musl recipe.
[1]: https://www.openwall.com/lists/musl/2020/03/10/11
---
To move discusion from musl mainling list futher I wrote this patch. I'm affraid that the patch can break existing builds. OTOH I've tested with my non-trivial distro and I find sdk/image working without any additional patches.
meta/recipes-core/musl/musl_git.bb | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
meta/recipes-core/musl/musl_git.bb +1 -14
@@ -66,24 +66,11 @@ 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}" RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
Signature · 1 line
2.25.0
Quoted 9 lines · On Wed, Mar 11, 2020 at 3:44 AM <[email protected]> wrote:
From: Jan Kaisrlik <[email protected]>
Based on the recommendation in musl mailing list[1] All symlinks have been removed from musl recipe.
[1]: https://www.openwall.com/lists/musl/2020/03/10/11
Signed-off-by Jan Kaisrlik <[email protected]>
Quoted 8 lines
---
To move discusion from musl mainling list futher I wrote this patch. I'm affraid
that the patch can break existing builds. OTOH I've tested with my non-trivial
distro and I find sdk/image working without any additional patches.
Reason was to have some of prebuilt application work but I guess that could now have grcompat perhaps
So this might be doable now I will have to test this patch a bit and see how it goes
Quoted 41 lines
meta/recipes-core/musl/musl_git.bb | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)meta/recipes-core/musl/ renamed from meta/recipes-core/musl/musl_git.bb +0
-0musl_git.bb
indexafc8446547..f4fbb03092100644meta/recipes-core/musl/musl_git.bb +0
-5@@ -66,24 +66,11 @@ 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.6libpthread.so.0 libresolv.so.2 librt.so.1 libutil.so.1; do
meta/recipes-core/musl/musl_git.bb +1
-9- 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}" RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-devlibssp-nonshared-staticdev"
RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
--
2.25.0