From 0c41ea3ad7e4b8d066097eed170fe9b10d0d5f0b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 17 Aug 2021 23:29:19 +0100 Subject: [PATCH] glibc: package the stub .a libaries into glibc-dev In glibc 2.34, the libraries libpthread, libdl, libutil, libanl have been integrated into libc. To retain compatibility with old binaries the shared libaries are still shipped but are empty, and to keep software building there are empty static libraries. However, these static libraries get packaged into glibc-staticdev (as they should be), but by this design they should be in glibc-dev. https://sourceware.org/pipermail/libc-alpha/2021-August/129718.html (From OE-Core rev: f42658198193dcf88814513e1fa09bf484777079) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 3026aec9b6..56fbf8b08c 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -22,6 +22,7 @@ ARCH_DYNAMIC_LOADER = "" ARCH_DYNAMIC_LOADER:aarch64 = "ld-linux-${TARGET_ARCH}.so.1" libc_baselibs:append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" INSANE_SKIP:${PN}:append:aarch64 = " libdir" +INSANE_SKIP:${PN}-dev += "staticdev" FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" @@ -38,7 +39,7 @@ FILES:sln = "${base_sbindir}/sln" FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" -FILES:${PN}-dev += "${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" +FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" RDEPENDS:${PN}-dev = "linux-libc-headers-dev" FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \