commit: 0af2660f8316b3a3fc927f1e28522b13247b63aa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 18 00:23:23 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
}
