commit: cad43ae953a6afe2bad3b705e8e298fcd3f84ac9 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Apr 22 11:47:36 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu May 1 11:36:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cad43ae9
sys-libs/basu: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/41697 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-libs/basu/Manifest | 1 - sys-libs/basu/basu-0.2.0-r1.ebuild | 43 ------------------ sys-libs/basu/basu-0.2.0.ebuild | 41 ----------------- ...GNU-ld-2.37-support-z-start-stop-gc-which.patch | 51 ---------------------- .../0001-basu-0.2.0-meson-add-libcap-option.patch | 39 ----------------- ...on-convert-audit-option-to-feature-object.patch | 49 --------------------- ...x-linking-on-LLD-13-LD-2.37-and-older-CCs.patch | 44 ------------------- 7 files changed, 268 deletions(-) diff --git a/sys-libs/basu/Manifest b/sys-libs/basu/Manifest index 37853bd6ebb5..0858f43311c7 100644 --- a/sys-libs/basu/Manifest +++ b/sys-libs/basu/Manifest @@ -1,2 +1 @@ -DIST basu-0.2.0.tar.gz 238861 BLAKE2B 4fcc664d031477c2ae82e535711561d1a7cb60503fb31fa80101c2046e3fe11f7886851649d38f3d5868a3266f45e651085d99ec95f6788baddbf78e893b1528 SHA512 dbc2f72b6e1a880fa41fe6067a38a301f456e4305dae6eb4d465089d7d9c2f629677ba23752b3e1a1fd476cb440db01ef3a218c1c976f38d0058eed584c80165 DIST basu-0.2.1.tar.gz 239178 BLAKE2B 8b8d5023b6816939a89acc9bdf6a49a464ad1d60dfafb80e9dd8485b743db9b497aef14cfa9f0bbab4aedcc07a20cac0e93b4b5071b2731f4762f9f514739aaf SHA512 b8017bbfdb5b408bd380e3b1cb1443321863ed8c9487ab0c8c80860c2ffb0c0403c81daf7e87f815027e9a826d08aa82a54c496bc87527209933e0d007b0c9ea diff --git a/sys-libs/basu/basu-0.2.0-r1.ebuild b/sys-libs/basu/basu-0.2.0-r1.ebuild deleted file mode 100644 index b319be74040f..000000000000 --- a/sys-libs/basu/basu-0.2.0-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -inherit meson python-any-r1 - -DESCRIPTION="The sd-bus library, extracted from systemd" -HOMEPAGE="https://sr.ht/~emersion/basu/"; -LICENSE="LGPL-2.1+" -SLOT="0" - -SRC_URI="https://git.sr.ht/~emersion/basu/refs/download/v${PV}/basu-${PV}.tar.gz"; -KEYWORDS="amd64" - -IUSE="audit caps" - -DEPEND=" - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap ) -" - -RDEPEND="${DEPEND}" -# Needed to generate hash tables -BDEPEND="${PYTHON_DEPS} - dev-util/gperf -" - -PATCHES=( - "${FILESDIR}"/0001-"${PN}"-0.2.0-meson-add-libcap-option.patch - "${FILESDIR}"/0002-"${PN}"-0.2.0-meson-convert-audit-option-to-feature-object.patch - "${FILESDIR}"/0001-"${PN}"-0.2.0-LLD-13-and-GNU-ld-2.37-support-z-start-stop-gc-which.patch - "${FILESDIR}"/0002-"${PN}"-0.2.0-meson-fix-linking-on-LLD-13-LD-2.37-and-older-CCs.patch -) - -src_configure() { - local emesonargs=( - $(meson_feature audit) - $(meson_feature caps libcap) - ) - meson_src_configure -} diff --git a/sys-libs/basu/basu-0.2.0.ebuild b/sys-libs/basu/basu-0.2.0.ebuild deleted file mode 100644 index 2a5e288ae73b..000000000000 --- a/sys-libs/basu/basu-0.2.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -inherit meson python-any-r1 - -DESCRIPTION="The sd-bus library, extracted from systemd" -HOMEPAGE="https://sr.ht/~emersion/basu/"; -LICENSE="LGPL-2.1+" -SLOT="0" - -SRC_URI="https://git.sr.ht/~emersion/basu/refs/download/v${PV}/basu-${PV}.tar.gz"; -KEYWORDS="~amd64" - -IUSE="audit caps" - -DEPEND=" - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap ) -" - -RDEPEND="${DEPEND}" -# Needed to generate hash tables -BDEPEND="${PYTHON_DEPS} - dev-util/gperf -" - -PATCHES=( - "${FILESDIR}"/0001-"${PN}"-0.2.0-meson-add-libcap-option.patch - "${FILESDIR}"/0002-"${PN}"-0.2.0-meson-convert-audit-option-to-feature-object.patch -) - -src_configure() { - local emesonargs=( - $(meson_feature audit) - $(meson_feature caps libcap) - ) - meson_src_configure -} diff --git a/sys-libs/basu/files/0001-basu-0.2.0-LLD-13-and-GNU-ld-2.37-support-z-start-stop-gc-which.patch b/sys-libs/basu/files/0001-basu-0.2.0-LLD-13-and-GNU-ld-2.37-support-z-start-stop-gc-which.patch deleted file mode 100644 index efc4add79542..000000000000 --- a/sys-libs/basu/files/0001-basu-0.2.0-LLD-13-and-GNU-ld-2.37-support-z-start-stop-gc-which.patch +++ /dev/null @@ -1,51 +0,0 @@ -From baa3a54e019b8ba6161fe20943c897490f4bcde8 Mon Sep 17 00:00:00 2001 -From: Fangrui Song <[email protected]> -Date: Sat, 27 Nov 2021 18:19:46 +0100 -Subject: [PATCH basu] LLD 13 and GNU ld 2.37 support -z start-stop-gc which - allows garbage collection of C identifier name sections despite the - __start_/__stop_ references. Simply set the retain attribute so that GCC 11 - (if configure-time binutils is 2.36 or newer)/Clang 13 will set the - SHF_GNU_RETAIN section attribute to prevent garbage collection. - -Without the patch, there are linker errors like the following with -z -start-stop-gc. - -``` -ld: error: undefined symbol: __start_SYSTEMD_BUS_ERROR_MAP ->>> referenced by bus-error.c:93 (../src/libsystemd/sd-bus/bus-error.c:93) ->>> sd-bus_bus-error.c.o:(bus_error_name_to_errno) in archive src/libsystemd/libsystemd_static.a -``` - -Co-authored-by: Evgeniy Khramtsov <[email protected]> ---- -Upstream: https://git.sr.ht/~emersion/basu/commit/5fa970e868f25ebc79ccca9b1d9df4c030d97661 -Gentoo bug: https://bugs.gentoo.org/832045 - - src/libsystemd/sd-bus/bus-error.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/libsystemd/sd-bus/bus-error.h b/src/libsystemd/sd-bus/bus-error.h -index 06c478a..883213f 100644 ---- a/src/libsystemd/sd-bus/bus-error.h -+++ b/src/libsystemd/sd-bus/bus-error.h -@@ -28,11 +28,17 @@ int bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_lis - * the bus error table, and BUS_ERROR_MAP_ELF_USE has to be used at - * least once per compilation unit (i.e. per library), to ensure that - * the error map is really added to the final binary. -+ * -+ * In addition, set the retain attribute so that the section cannot be -+ * discarded by ld --gc-sections -z start-stop-gc. Older compilers would -+ * warn for the unknown attribute, so just disable -Wattributes. - */ - - #define BUS_ERROR_MAP_ELF_REGISTER \ -+ _Pragma("GCC diagnostic ignored \"-Wattributes\"") \ - __attribute__ ((__section__("BUS_ERROR_MAP"))) \ - __attribute__ ((__used__)) \ -+ __attribute__ ((retain)) \ - __attribute__ ((aligned(8))) - - #define BUS_ERROR_MAP_ELF_USE(errors) \ --- -2.34.1 - diff --git a/sys-libs/basu/files/0001-basu-0.2.0-meson-add-libcap-option.patch b/sys-libs/basu/files/0001-basu-0.2.0-meson-add-libcap-option.patch deleted file mode 100644 index b2727b95a7d7..000000000000 --- a/sys-libs/basu/files/0001-basu-0.2.0-meson-add-libcap-option.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 64c1c624ea63f7a3eba4f0b7cf6a7d7aff952982 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <[email protected]> -Date: Fri, 5 Nov 2021 18:36:54 +0100 -Subject: [PATCH 1/2] meson: add libcap option - -it's better to provide the user with this choice instead of -unconditionally magically depending on it ---- - meson.build | 2 +- - meson_options.txt | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 056c7c4..357b346 100644 ---- a/meson.build -+++ b/meson.build -@@ -231,7 +231,7 @@ threads = dependency('threads') - librt = cc.find_library('rt') - libm = cc.find_library('m') - --libcap = dependency('libcap', required: false) -+libcap = dependency('libcap', required: get_option('libcap')) - have_libcap = libcap.found() - conf.set10('HAVE_LIBCAP', have_libcap) - -diff --git a/meson_options.txt b/meson_options.txt -index 8cf3a33..ae5c7b1 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -14,3 +14,6 @@ option('system-bus-address', type : 'string', - - option('audit', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'libaudit support') -+ -+option('libcap', type : 'feature', -+ description : 'libcap support') --- -2.32.0 - diff --git a/sys-libs/basu/files/0002-basu-0.2.0-meson-convert-audit-option-to-feature-object.patch b/sys-libs/basu/files/0002-basu-0.2.0-meson-convert-audit-option-to-feature-object.patch deleted file mode 100644 index 3d32f0b2352b..000000000000 --- a/sys-libs/basu/files/0002-basu-0.2.0-meson-convert-audit-option-to-feature-object.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 34d1b77f1dd15d55cfc12ef2ee52fd3b6b1d76ce Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <[email protected]> -Date: Fri, 5 Nov 2021 18:39:56 +0100 -Subject: [PATCH 2/2] meson: convert audit option to feature object - -features are more idiomatic and ubiquitous ---- - meson.build | 11 ++--------- - meson_options.txt | 2 +- - 2 files changed, 3 insertions(+), 10 deletions(-) - -diff --git a/meson.build b/meson.build -index 357b346..1f29690 100644 ---- a/meson.build -+++ b/meson.build -@@ -235,15 +235,8 @@ libcap = dependency('libcap', required: get_option('libcap')) - have_libcap = libcap.found() - conf.set10('HAVE_LIBCAP', have_libcap) - --want_audit = get_option('audit') --if want_audit != 'false' -- libaudit = dependency('audit', required : want_audit == 'true') -- have = libaudit.found() --else -- have = false -- libaudit = [] --endif --conf.set10('HAVE_AUDIT', have) -+libaudit = dependency('audit', required : get_option('audit')) -+conf.set10('HAVE_AUDIT', libaudit.found()) - - tests = [] - -diff --git a/meson_options.txt b/meson_options.txt -index ae5c7b1..87adfc2 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -12,7 +12,7 @@ option('system-bus-address', type : 'string', - description : 'The address of the sytem bus (defined at dbus compilation)', - value : 'unix:path=/var/run/dbus/system_bus_socket') - --option('audit', type : 'combo', choices : ['auto', 'true', 'false'], -+option('audit', type : 'feature', - description : 'libaudit support') - - option('libcap', type : 'feature', --- -2.32.0 - diff --git a/sys-libs/basu/files/0002-basu-0.2.0-meson-fix-linking-on-LLD-13-LD-2.37-and-older-CCs.patch b/sys-libs/basu/files/0002-basu-0.2.0-meson-fix-linking-on-LLD-13-LD-2.37-and-older-CCs.patch deleted file mode 100644 index c0a9399ecf77..000000000000 --- a/sys-libs/basu/files/0002-basu-0.2.0-meson-fix-linking-on-LLD-13-LD-2.37-and-older-CCs.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c4d9f5aac80d02b7e7447d2eda698e17a245071e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <[email protected]> -Date: Tue, 25 Jan 2022 18:36:36 +0100 -Subject: [PATCH basu] meson: fix linking on LLD 13/LD 2.37 and older CCs - -For compilers that do not support __attribute((retain)), --z no-start-stop-gc is a requirement. ---- -Submitted at: https://lists.sr.ht/~emersion/public-inbox/patches/28722#%[email protected]%3E -Gentoo bug: https://bugs.gentoo.org/832045 - - meson.build | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/meson.build b/meson.build -index 1f29690..74e9934 100644 ---- a/meson.build -+++ b/meson.build -@@ -101,6 +101,22 @@ if get_option('buildtype') != 'debug' - possible_link_flags += '-Wl,--gc-sections' - endif - -+if cc.get_id() in ['gcc', 'clang'] -+# XXX(arsen): remember to update with a future meson release -+ has_retain_attr = cc.compiles( -+ '__attribute__((retain)) int x;', -+ args : ['-Werror=attributes'], -+ name : 'compiler supports __attribute__((retain))' -+ ) -+ -+ if not has_retain_attr and cc.has_link_argument('-Wl,-z,start-stop-gc') -+ possible_link_flags += [ -+ '-Wl,-z,nostart-stop-gc' -+ ] -+ endif -+endif -+ -+ - add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language : 'c') - add_project_link_arguments(cc.get_supported_link_arguments(possible_link_flags), language : 'c') - --- -2.34.1 -
