From 437b7fcfe31524736c78e99b36258acbfe4ebece Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 3 Feb 2022 12:02:03 -0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/conf/distro/include/tclibc-glibc.inc | 2 +- meta/recipes-core/glibc/glibc-package.inc | 5 +---- meta/recipes-core/musl/musl_git.bb | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'meta') 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" CXXFLAGS += "-fvisibility-inlines-hidden" -LIBC_DEPENDENCIES = "libsegfault \ +LIBC_DEPENDENCIES = "\ glibc \ glibc-dbg \ 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 @@ INHIBIT_SYSROOT_STRIP = "1" -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" +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" # The ld.so in this glibc supports the GNU_HASH RPROVIDES:${PN} = "eglibc rtld(GNU_HASH)" @@ -29,7 +29,6 @@ FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" FILES:ldconfig = "${base_sbindir}/ldconfig" FILES:ldd = "${bindir}/ldd" -FILES:libsegfault = "${base_libdir}/libSegFault*" FILES:ldso = "${bindir}/${MLPREFIX}ld.so" FILES:libmemusage = "${base_libdir}/libmemusage.so" 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 FILES:${PN}-mtrace = "${bindir}/mtrace" FILES:tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump" FILES:${PN}-utils = "${bindir}/* ${sbindir}/*" -FILES:catchsegv = "${bindir}/catchsegv" -RDEPENDS:catchsegv = "libsegfault" FILES:${PN}-pcprofile = "${base_libdir}/libpcprofile.so" FILES:glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" 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 \ RDEPENDS:${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" RPROVIDES:${PN}-dev += "libc-dev virtual-libc-dev" -RPROVIDES:${PN} += "ldd libsegfault rtld(GNU_HASH)" +RPROVIDES:${PN} += "ldd rtld(GNU_HASH)" LEAD_SONAME = "libc.so" INSANE_SKIP:${PN}-dev = "staticdev" -- cgit v1.2.3-54-g00ecf