From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE51115812D for ; Fri, 03 Jan 2025 01:47:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2ADC5E08AD; Fri, 03 Jan 2025 01:47:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 37F1EE08BB for ; Fri, 03 Jan 2025 01:47:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 377C733BE3B for ; Fri, 03 Jan 2025 01:47:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9503911B5 for ; Fri, 03 Jan 2025 01:47:44 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1735868504.a15a740333017faf95f9f06cc1f86d12ea713e81.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nghttp3/, net-libs/nghttp3/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nghttp3/files/nghttp3-1.7.0-munit-c23.patch net-libs/nghttp3/nghttp3-1.7.0.ebuild X-VCS-Directories: net-libs/nghttp3/files/ net-libs/nghttp3/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a15a740333017faf95f9f06cc1f86d12ea713e81 X-VCS-Branch: master Date: Fri, 03 Jan 2025 01:47:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ae724e1a-7d25-43e1-ac86-24057b40d194 X-Archives-Hash: 329fa2e94bfc8f2e1b3dcb73d258d682 commit: a15a740333017faf95f9f06cc1f86d12ea713e81 Author: Sam James gentoo org> AuthorDate: Fri Jan 3 01:41:44 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 3 01:41:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a15a7403 net-libs/nghttp3: fix build of tests w/ c23 Same as in a7dfda3569459f3ea16b905260e22a3115bfc595 for nghttp2. Signed-off-by: Sam James gentoo.org> .../nghttp3/files/nghttp3-1.7.0-munit-c23.patch | 28 ++++++++++++++++++++++ net-libs/nghttp3/nghttp3-1.7.0.ebuild | 6 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/net-libs/nghttp3/files/nghttp3-1.7.0-munit-c23.patch b/net-libs/nghttp3/files/nghttp3-1.7.0-munit-c23.patch new file mode 100644 index 000000000000..93d208fa4215 --- /dev/null +++ b/net-libs/nghttp3/files/nghttp3-1.7.0-munit-c23.patch @@ -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 + # 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, diff --git a/net-libs/nghttp3/nghttp3-1.7.0.ebuild b/net-libs/nghttp3/nghttp3-1.7.0.ebuild index 435f7754e75c..70addd2e8479 100644 --- a/net-libs/nghttp3/nghttp3-1.7.0.ebuild +++ b/net-libs/nghttp3/nghttp3-1.7.0.ebuild @@ -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 @@ -27,6 +27,10 @@ REQUIRED_USE=" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-1.7.0-munit-c23.patch +) + multilib_src_configure() { local mycmakeargs=( -DENABLE_LIB_ONLY=ON