commit: 382e8109881dac3f6ade3465a3e2ab0e0310bf13 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jan 3 01:44:01 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 3 01:44:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=382e8109
net-libs/nghttp3: run tests for multilib too This constraint was added in 319194338d8e709133b86b054c3d284bd899c178 but I'm not sure why. ngtcp2 and nghttp3 both work fine with multilib tests and nghttp3 seems to as well. Signed-off-by: Sam James <sam <AT> gentoo.org> net-libs/nghttp3/nghttp3-1.7.0.ebuild | 5 ++--- net-libs/nghttp3/nghttp3-9999.ebuild | 13 ++++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/net-libs/nghttp3/nghttp3-1.7.0.ebuild b/net-libs/nghttp3/nghttp3-1.7.0.ebuild index 70addd2e8479..86f7b5d1f125 100644 --- a/net-libs/nghttp3/nghttp3-1.7.0.ebuild +++ b/net-libs/nghttp3/nghttp3-1.7.0.ebuild @@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/ngtcp2/nghttp3/"; LICENSE="MIT" SLOT="0/0" - IUSE="static-libs test" RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -36,11 +35,11 @@ multilib_src_configure() { -DENABLE_LIB_ONLY=ON -DENABLE_STATIC_LIB=$(usex static-libs) -DENABLE_EXAMPLES=OFF + -DBUILD_TESTING=$(usex test) ) - use test && mycmakeargs+=( -DBUILD_TESTING=ON ) cmake_src_configure } multilib_src_test() { - multilib_is_native_abi && cmake_build check + cmake_build check } diff --git a/net-libs/nghttp3/nghttp3-9999.ebuild b/net-libs/nghttp3/nghttp3-9999.ebuild index 42309a43581b..17b289e52ca1 100644 --- a/net-libs/nghttp3/nghttp3-9999.ebuild +++ b/net-libs/nghttp3/nghttp3-9999.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 @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="HTTP/3 library written in C" @@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/ngtcp2/nghttp3/"; LICENSE="MIT" SLOT="0/0" - IUSE="static-libs test" RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -27,16 +26,20 @@ REQUIRED_USE=" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-1.7.0-munit-c23.patch +) + multilib_src_configure() { local mycmakeargs=( -DENABLE_LIB_ONLY=ON -DENABLE_STATIC_LIB=$(usex static-libs) -DENABLE_EXAMPLES=OFF + -DBUILD_TESTING=$(usex test) ) - use test && mycmakeargs+=( -DBUILD_TESTING=ON ) cmake_src_configure } multilib_src_test() { - multilib_is_native_abi && cmake_build check + cmake_build check }
