diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-02-03 12:02:03 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-10 10:32:07 +0000 |
commit | 437b7fcfe31524736c78e99b36258acbfe4ebece (patch) | |
tree | ea81ee0280a6a7bdb1558a2bc08f7542222defd7 | |
parent | a8b7d51ccec6208ec91be7c7b207b110e3269e78 (diff) | |
download | poky-437b7fcfe31524736c78e99b36258acbfe4ebece.tar.gz |
meta: Remove libsegfault and catchsegv
Glibc has dropped them starting with 2.35 see [1]
[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=65ccd641bacea33be23d51da737c2de7543d0f5e
(From OE-Core rev: 95c61d834596263ab1dd1fb1f8c8dbcc9104a935)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/distro/include/tclibc-glibc.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 5 | ||||
-rw-r--r-- | meta/recipes-core/musl/musl_git.bb | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc index 3246490997..f4855dce11 100644 --- a/meta/conf/distro/include/tclibc-glibc.inc +++ b/meta/conf/distro/include/tclibc-glibc.inc | |||
@@ -16,7 +16,7 @@ PREFERRED_PROVIDER_virtual/libc-locale ?= "glibc-locale" | |||
16 | 16 | ||
17 | CXXFLAGS += "-fvisibility-inlines-hidden" | 17 | CXXFLAGS += "-fvisibility-inlines-hidden" |
18 | 18 | ||
19 | LIBC_DEPENDENCIES = "libsegfault \ | 19 | LIBC_DEPENDENCIES = "\ |
20 | glibc \ | 20 | glibc \ |
21 | glibc-dbg \ | 21 | glibc-dbg \ |
22 | glibc-dev \ | 22 | glibc-dev \ |
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 90437a1c6f..c1c0114a07 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | INHIBIT_SYSROOT_STRIP = "1" | 1 | INHIBIT_SYSROOT_STRIP = "1" |
2 | 2 | ||
3 | PACKAGES = "${PN}-dbg catchsegv sln nscd ldconfig ldd ldso tzcode glibc-thread-db ${PN}-pic libmemusage malloc-debug libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-src" | 3 | PACKAGES = "${PN}-dbg sln nscd ldconfig ldd ldso tzcode glibc-thread-db ${PN}-pic libmemusage malloc-debug libnss-db ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-src" |
4 | 4 | ||
5 | # The ld.so in this glibc supports the GNU_HASH | 5 | # The ld.so in this glibc supports the GNU_HASH |
6 | RPROVIDES:${PN} = "eglibc rtld(GNU_HASH)" | 6 | RPROVIDES:${PN} = "eglibc rtld(GNU_HASH)" |
@@ -29,7 +29,6 @@ FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" | |||
29 | RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" | 29 | RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" |
30 | FILES:ldconfig = "${base_sbindir}/ldconfig" | 30 | FILES:ldconfig = "${base_sbindir}/ldconfig" |
31 | FILES:ldd = "${bindir}/ldd" | 31 | FILES:ldd = "${bindir}/ldd" |
32 | FILES:libsegfault = "${base_libdir}/libSegFault*" | ||
33 | FILES:ldso = "${bindir}/${MLPREFIX}ld.so" | 32 | FILES:ldso = "${bindir}/${MLPREFIX}ld.so" |
34 | FILES:libmemusage = "${base_libdir}/libmemusage.so" | 33 | FILES:libmemusage = "${base_libdir}/libmemusage.so" |
35 | FILES:malloc-debug = "${base_libdir}/libc_malloc_debug.so.0" | 34 | FILES:malloc-debug = "${base_libdir}/libc_malloc_debug.so.0" |
@@ -48,8 +47,6 @@ FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_system_unitdi | |||
48 | FILES:${PN}-mtrace = "${bindir}/mtrace" | 47 | FILES:${PN}-mtrace = "${bindir}/mtrace" |
49 | FILES:tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump" | 48 | FILES:tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump" |
50 | FILES:${PN}-utils = "${bindir}/* ${sbindir}/*" | 49 | FILES:${PN}-utils = "${bindir}/* ${sbindir}/*" |
51 | FILES:catchsegv = "${bindir}/catchsegv" | ||
52 | RDEPENDS:catchsegv = "libsegfault" | ||
53 | FILES:${PN}-pcprofile = "${base_libdir}/libpcprofile.so" | 50 | FILES:${PN}-pcprofile = "${base_libdir}/libpcprofile.so" |
54 | FILES:glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" | 51 | FILES:glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" |
55 | RPROVIDES:${PN}-dev += "libc-dev" | 52 | RPROVIDES:${PN}-dev += "libc-dev" |
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 34f4c1e98d..1e33ad5317 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb | |||
@@ -78,7 +78,7 @@ FILES:${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ | |||
78 | 78 | ||
79 | RDEPENDS:${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" | 79 | RDEPENDS:${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" |
80 | RPROVIDES:${PN}-dev += "libc-dev virtual-libc-dev" | 80 | RPROVIDES:${PN}-dev += "libc-dev virtual-libc-dev" |
81 | RPROVIDES:${PN} += "ldd libsegfault rtld(GNU_HASH)" | 81 | RPROVIDES:${PN} += "ldd rtld(GNU_HASH)" |
82 | 82 | ||
83 | LEAD_SONAME = "libc.so" | 83 | LEAD_SONAME = "libc.so" |
84 | INSANE_SKIP:${PN}-dev = "staticdev" | 84 | INSANE_SKIP:${PN}-dev = "staticdev" |