commit: 779eeb1c7d2bb79bf8c69f5a33cabd7c6f3a7a58 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Mar 24 06:59:49 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Mar 24 06:59:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=779eeb1c
dev-libs/userspace-rcu: add 0.14.0 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/userspace-rcu/Manifest | 1 + .../files/userspace-rcu-0.14.0-c11.patch | 61 ++++++++++++++++++++++ .../files/userspace-rcu-0.14.0-noreturn.patch | 51 ++++++++++++++++++ dev-libs/userspace-rcu/userspace-rcu-0.14.0.ebuild | 58 ++++++++++++++++++++ 4 files changed, 171 insertions(+) diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest index 2e76cc583702..bb9ddf3d1c66 100644 --- a/dev-libs/userspace-rcu/Manifest +++ b/dev-libs/userspace-rcu/Manifest @@ -1 +1,2 @@ DIST userspace-rcu-0.13.2.tar.bz2 611448 BLAKE2B 6d502e0035b03df262c917ba70f7442e2bd81369091b2c521fe5c32f31ed2ef7404070759f3a8910b767153e05d28e354d5e5ece2a3ba17e4a31dd7db3e1924f SHA512 e5097a7f653f51b3a47a09f79e7a153aab8fd22c0504a1127a9b33d093a9ae6a941b97c0fe175ee168e2976097aefdcdf8d5ce030afbe565c1b72f64d6f5b60a +DIST userspace-rcu-0.14.0.tar.bz2 661322 BLAKE2B ba9fa4c6dec693d2616234187db531f00fc0ade65f7e2a57182d9441728ddfa6f3e9d4544b824ca5edf7c027a43c9231d998a309c01f4bbab1eeefe856344f77 SHA512 7297e51012f4c44ee27c0e18ed9d87bf24be34db68a5398394c1e683a045bb561cf74aa913398404c0ed5cb8011af728ea12947717fa5f27627e5ca78e63a40f diff --git a/dev-libs/userspace-rcu/files/userspace-rcu-0.14.0-c11.patch b/dev-libs/userspace-rcu/files/userspace-rcu-0.14.0-c11.patch new file mode 100644 index 000000000000..c931e052c432 --- /dev/null +++ b/dev-libs/userspace-rcu/files/userspace-rcu-0.14.0-c11.patch @@ -0,0 +1,61 @@ +https://github.com/urcu/userspace-rcu/commit/6fa8b4f80f1d2efbc90fc6d2a5fb0dc1d7fd2a19 + +From 6fa8b4f80f1d2efbc90fc6d2a5fb0dc1d7fd2a19 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ond...@sury.org> +Date: Fri, 17 Mar 2023 16:44:10 +0100 +Subject: [PATCH] Fix: use __noreturn__ for C11-compatibility +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The noreturn convenience macro provided by stdnoreturn.h might get +included before urcu headers, use __noreturn__ for better compatibility +with code using <stdnoreturn.h> header. + +Signed-off-by: Ondřej Surý <ond...@sury.org> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoy...@efficios.com> +--- a/include/urcu/uatomic/generic.h ++++ b/include/urcu/uatomic/generic.h +@@ -38,7 +38,7 @@ extern "C" { + #endif + + #if !defined __OPTIMIZE__ || defined UATOMIC_NO_LINK_ERROR +-static inline __attribute__((always_inline, noreturn)) ++static inline __attribute__((always_inline, __noreturn__)) + void _uatomic_link_error(void) + { + #ifdef ILLEGAL_INSTR +--- a/src/urcu-call-rcu-impl.h ++++ b/src/urcu-call-rcu-impl.h +@@ -1064,7 +1064,7 @@ void urcu_register_rculfhash_atfork(struct urcu_atfork *atfork) + * This unregistration function is deprecated, meant only for internal + * use by rculfhash. + */ +-__attribute__((noreturn)) ++__attribute__((__noreturn__)) + void urcu_unregister_rculfhash_atfork(struct urcu_atfork *atfork __attribute__((unused))) + { + urcu_die(EPERM); +--- a/tests/regression/rcutorture.h ++++ b/tests/regression/rcutorture.h +@@ -572,7 +572,7 @@ int stresstest(int nreaders) + */ + + static +-void usage(char *argv[]) __attribute__((noreturn)); ++void usage(char *argv[]) __attribute__((__noreturn__)); + + static + void usage(char *argv[]) +--- a/tests/utils/tap.h ++++ b/tests/utils/tap.h +@@ -41,7 +41,7 @@ __attribute__((format(TAP_PRINTF_FORMAT, 5, 6))) + unsigned int _gen_result(int, const char *, const char *, unsigned int, const char *, ...); + + int plan_no_plan(void); +-__attribute__((noreturn)) ++__attribute__((__noreturn__)) + int plan_skip_all(const char *); + int plan_tests(unsigned int); + + diff --git a/dev-libs/userspace-rcu/files/userspace-rcu-0.14.0-noreturn.patch b/dev-libs/userspace-rcu/files/userspace-rcu-0.14.0-noreturn.patch new file mode 100644 index 000000000000..c8798092f158 --- /dev/null +++ b/dev-libs/userspace-rcu/files/userspace-rcu-0.14.0-noreturn.patch @@ -0,0 +1,51 @@ +https://github.com/urcu/userspace-rcu/commit/106ed13754b1b836f4b59405f4e02aea4bf5eef0 + +From 106ed13754b1b836f4b59405f4e02aea4bf5eef0 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjean...@efficios.com> +Date: Thu, 23 Mar 2023 14:23:55 -0400 +Subject: [PATCH] fix: warning 'noreturn' function does return on ppc + +On a ppc64 system with gcc 9.5.0 I get the following error when building +with -O0 : + +/usr/include/urcu/uatomic/generic.h: In function 'void _uatomic_link_error()': +/usr/include/urcu/uatomic/generic.h:53:1: warning: 'noreturn' function does return + 53 | } + | ^ + +Split the inline function in 2 variants and apply the noreturn attribute +only on the builtin_trap one. + +Change-Id: I5ae8e764c4cc27af0463924a653b9eaa9f698c34 +Signed-off-by: Michael Jeanson <mjean...@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoy...@efficios.com> +--- a/include/urcu/uatomic/generic.h ++++ b/include/urcu/uatomic/generic.h +@@ -38,19 +38,23 @@ extern "C" { + #endif + + #if !defined __OPTIMIZE__ || defined UATOMIC_NO_LINK_ERROR +-static inline __attribute__((always_inline, __noreturn__)) ++#ifdef ILLEGAL_INSTR ++static inline __attribute__((always_inline)) + void _uatomic_link_error(void) + { +-#ifdef ILLEGAL_INSTR + /* + * generate an illegal instruction. Cannot catch this with + * linker tricks when optimizations are disabled. + */ + __asm__ __volatile__(ILLEGAL_INSTR); ++} + #else ++static inline __attribute__((always_inline, __noreturn__)) ++void _uatomic_link_error(void) ++{ + __builtin_trap(); +-#endif + } ++#endif + + #else /* #if !defined __OPTIMIZE__ || defined UATOMIC_NO_LINK_ERROR */ + extern void _uatomic_link_error(void); + diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.14.0.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.14.0.ebuild new file mode 100644 index 000000000000..851b0aa9195e --- /dev/null +++ b/dev-libs/userspace-rcu/userspace-rcu-0.14.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Userspace RCU (read-copy-update) library" +HOMEPAGE="https://liburcu.org/"; +SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"; + +LICENSE="LGPL-2.1" +SLOT="0/8" # subslot = soname version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( sys-process/time )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.13.1-tests-no-benchmark.patch + "${FILESDIR}"/${PN}-0.13.1-loong.patch + "${FILESDIR}"/${P}-c11.patch + "${FILESDIR}"/${P}-noreturn.patch +) + +src_prepare() { + default + + # Needed for tests patch + # ... and refresh libtool (see https://github.com/gentoo/gentoo/pull/23973) + # ... and for build on loong (see https://github.com/gentoo/gentoo/pull/25189) + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-shared + $(use_enable static-libs static) + ) + + econf "${myeconfargs[@]}" +} + +src_test() { + default + + emake -C tests/regression regtest + + # We don't run the benchmark tests. + rm tests/benchmark/test-suite.log || die +} + +src_install() { + default + + find "${ED}" -type f -name "*.la" -delete || die +}
