From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D41491584F2 for ; Tue, 18 Mar 2025 00:28:10 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id BA5763431E0 for ; Tue, 18 Mar 2025 00:28:10 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 279D61103C7; Tue, 18 Mar 2025 00:28:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id 1CA411103C7 for ; Tue, 18 Mar 2025 00:28:07 +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 9DD8E3431F4 for ; Tue, 18 Mar 2025 00:28:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B564A2144 for ; Tue, 18 Mar 2025 00:28:04 +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: <1742257660.0af2660f8316b3a3fc927f1e28522b13247b63aa.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nghttp3/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nghttp3/nghttp3-1.8.0-r1.ebuild net-libs/nghttp3/nghttp3-9999.ebuild X-VCS-Directories: net-libs/nghttp3/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0af2660f8316b3a3fc927f1e28522b13247b63aa X-VCS-Branch: master Date: Tue, 18 Mar 2025 00:28:04 +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: c933d9d1-60d8-4e5e-a8d6-1c9163e4d676 X-Archives-Hash: 8c2415504157d5d5853faf535e02e69d commit: 0af2660f8316b3a3fc927f1e28522b13247b63aa Author: Sam James gentoo org> AuthorDate: Tue Mar 18 00:23:23 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 18 00:27:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af2660f net-libs/nghttp3: build with autotools, rather than cmake We need to use autotools rather than CMake here because of a circular dependency (ditto nghttp2): We need to use autotools rather than CMake here because of a circular dependency (ditto nghttp2): ``` (net-misc/curl-8.11.1-r2:0/0::gentoo, ebuild scheduled for merge) depends on (net-libs/nghttp3-1.7.0:0/0::gentoo, ebuild scheduled for merge) (buildtime) (dev-build/cmake-3.31.5:0/0::gentoo, ebuild scheduled for merge) (buildtime) (net-misc/curl-8.11.1-r2:0/0::gentoo, ebuild scheduled for merge) (buildtime) ``` Closes: https://bugs.gentoo.org/951524 Signed-off-by: Sam James gentoo.org> net-libs/nghttp3/nghttp3-1.8.0-r1.ebuild | 41 ++++++++++++++++++++++++++++++++ net-libs/nghttp3/nghttp3-9999.ebuild | 37 ++++++++++++++-------------- 2 files changed, 59 insertions(+), 19 deletions(-) diff --git a/net-libs/nghttp3/nghttp3-1.8.0-r1.ebuild b/net-libs/nghttp3/nghttp3-1.8.0-r1.ebuild new file mode 100644 index 000000000000..a5c5c87cc96b --- /dev/null +++ b/net-libs/nghttp3/nghttp3-1.8.0-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ngtcp2/nghttp3.git" + inherit autotools git-r3 +else + SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz" + + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="HTTP/3 library written in C" +HOMEPAGE="https://github.com/ngtcp2/nghttp3" + +LICENSE="MIT" +SLOT="0/0" + +src_prepare() { + default + [[ ${PV} == 9999 ]] && eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --disable-werror + --disable-debug + --enable-lib-only + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}"/usr -type f -name '*.la' -delete || die +} diff --git a/net-libs/nghttp3/nghttp3-9999.ebuild b/net-libs/nghttp3/nghttp3-9999.ebuild index 9e1fdeb754e4..a5c5c87cc96b 100644 --- a/net-libs/nghttp3/nghttp3-9999.ebuild +++ b/net-libs/nghttp3/nghttp3-9999.ebuild @@ -3,40 +3,39 @@ EAPI=8 -inherit cmake-multilib +inherit multilib-minimal if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/ngtcp2/nghttp3.git" - inherit git-r3 + inherit autotools git-r3 else SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" + + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="HTTP/3 library written in C" -HOMEPAGE="https://github.com/ngtcp2/nghttp3/" +HOMEPAGE="https://github.com/ngtcp2/nghttp3" LICENSE="MIT" SLOT="0/0" -IUSE="static-libs test" -RESTRICT="!test? ( test )" -# Without static-libs, src_test just won't run any tests and "pass". -REQUIRED_USE=" - test? ( static-libs ) -" -BDEPEND="virtual/pkgconfig" +src_prepare() { + default + [[ ${PV} == 9999 ]] && eautoreconf +} multilib_src_configure() { - local mycmakeargs=( - -DENABLE_LIB_ONLY=ON - -DENABLE_STATIC_LIB=$(usex static-libs) - -DENABLE_EXAMPLES=OFF - -DBUILD_TESTING=$(usex test) + local myeconfargs=( + --disable-werror + --disable-debug + --enable-lib-only ) - cmake_src_configure + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } -multilib_src_test() { - cmake_build check +multilib_src_install_all() { + einstalldocs + find "${ED}"/usr -type f -name '*.la' -delete || die }