diff options
| author | Ross Burton <ross@burtonini.com> | 2021-08-17 23:29:19 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-18 17:01:06 +0100 |
| commit | 0c41ea3ad7e4b8d066097eed170fe9b10d0d5f0b (patch) | |
| tree | 2f567e726ca994af72d743d8e9d6efba7ad33863 | |
| parent | 8ab0f43fdac1210dd216f1564721278113faec7f (diff) | |
| download | poky-0c41ea3ad7e4b8d066097eed170fe9b10d0d5f0b.tar.gz | |
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 <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 3 |
1 files changed, 2 insertions, 1 deletions
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 = "" | |||
| 22 | ARCH_DYNAMIC_LOADER:aarch64 = "ld-linux-${TARGET_ARCH}.so.1" | 22 | ARCH_DYNAMIC_LOADER:aarch64 = "ld-linux-${TARGET_ARCH}.so.1" |
| 23 | libc_baselibs:append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" | 23 | libc_baselibs:append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" |
| 24 | INSANE_SKIP:${PN}:append:aarch64 = " libdir" | 24 | INSANE_SKIP:${PN}:append:aarch64 = " libdir" |
| 25 | INSANE_SKIP:${PN}-dev += "staticdev" | ||
| 25 | 26 | ||
| 26 | FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" | 27 | FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" |
| 27 | RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" | 28 | RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" |
| @@ -38,7 +39,7 @@ FILES:sln = "${base_sbindir}/sln" | |||
| 38 | FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" | 39 | FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" |
| 39 | FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" | 40 | FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" |
| 40 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" | 41 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" |
| 41 | FILES:${PN}-dev += "${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" | 42 | 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" |
| 42 | RDEPENDS:${PN}-dev = "linux-libc-headers-dev" | 43 | RDEPENDS:${PN}-dev = "linux-libc-headers-dev" |
| 43 | FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" | 44 | FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" |
| 44 | FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ | 45 | FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ |