gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-22 16:29:05 -07:00
Code Issues Projects Releases Wiki Activity

net-libs/ngtcp2: fix build of tests w/ c23

Browse Source 
Same as in a7dfda3569 for nghttp2.

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2025-01-01 08:01:13 +00:00
parent 9511d13d1e
commit 5bfb0efe34
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
net-libs/ngtcp2/files/ngtcp2-1.10.0-munit-c23.patch Normal file
View File

@@ -0,0 +1,28 @@
https://github.com/nemequ/munit/pull/105
--- a/tests/munit/munit.c
+++ b/tests/munit/munit.c
@@ -858,23 +858,18 @@ static psnip_uint64_t munit_clock_get_elapsed(struct PsnipClockTimespec *start,
#if defined(_OPENMP)
# define ATOMIC_UINT32_T uint32_t
-# define ATOMIC_UINT32_INIT(x) (x)
#elif defined(HAVE_STDATOMIC)
# include <stdatomic.h>
# define ATOMIC_UINT32_T _Atomic uint32_t
-# define ATOMIC_UINT32_INIT(x) ATOMIC_VAR_INIT(x)
#elif defined(HAVE_CLANG_ATOMICS)
# define ATOMIC_UINT32_T _Atomic uint32_t
-# define ATOMIC_UINT32_INIT(x) (x)
#elif defined(_WIN32)
# define ATOMIC_UINT32_T volatile LONG
-# define ATOMIC_UINT32_INIT(x) (x)
#else
# define ATOMIC_UINT32_T volatile uint32_t
-# define ATOMIC_UINT32_INIT(x) (x)
#endif
-static ATOMIC_UINT32_T munit_rand_state = ATOMIC_UINT32_INIT(42);
+static ATOMIC_UINT32_T munit_rand_state = 42;
#if defined(_OPENMP)
static inline void munit_atomic_store(ATOMIC_UINT32_T *dest,

6
net-libs/ngtcp2/ngtcp2-1.10.0.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -33,6 +33,10 @@ DEPEND="${RDEPEND}
test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-1.10.0-munit-c23.patch
)
multilib_src_configure() {
local mycmakeargs=(
-DENABLE_STATIC_LIB=$(usex static-libs)

6
net-libs/ngtcp2/ngtcp2-9999.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -33,6 +33,10 @@ DEPEND="${RDEPEND}
test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-1.10.0-munit-c23.patch
)
multilib_src_configure() {
local mycmakeargs=(
-DENABLE_STATIC_LIB=$(usex static-libs)