net-libs/nghttp2: Sync with Gentoo

It's from Gentoo commit b6889811fb8d2d971d53714bfa5f54d9c88de1be.
This commit is contained in:
Flatcar Buildbot 2025-06-16 07:12:52 +00:00 committed by Krzesimir Nowak
parent 1fac115825
commit 912ef80f03
4 changed files with 35 additions and 63 deletions

View File

@ -0,0 +1,29 @@
https://github.com/nghttp2/nghttp2/commit/1440e883475488ddda25556c7b3d9f78694716ba
From 1440e883475488ddda25556c7b3d9f78694716ba Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 30 May 2025 21:20:51 +0100
Subject: [PATCH] src/template.h: add missing `cstdint` include
Without the change build against upcoming gcc-16 fails as:
template.h:457:9: error: ISO C++ forbids declaration of 'type name' with no type [-fpermissive]
457 | const uint8_t, N == std::dynamic_extent ? std::dynamic_extent : N * sizeof(T)>
| ^~~~~~~
---
src/template.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/template.h b/src/template.h
index e154057fd4..4f0622b2c4 100644
--- a/src/template.h
+++ b/src/template.h
@@ -27,6 +27,7 @@
#include "nghttp2_config.h"
+#include <cstdint>
#include <cstring>
#include <cstdio>
#include <cstdlib>

View File

@ -35,11 +35,15 @@ RDEPEND="
>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
)
systemd? ( >=sys-apps/systemd-209 )
xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )
xml? ( >=dev-libs/libxml2-2.7.7:2=[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-gcc16.patch
)
src_prepare() {
default
[[ ${PV} == 9999 ]] && eautoreconf

View File

@ -1,61 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake-multilib
DESCRIPTION="HTTP/2 C Library"
HOMEPAGE="https://nghttp2.org/"
SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/1.14" # 1.<SONAME>
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml"
REQUIRED_USE="test? ( static-libs )"
RESTRICT="!test? ( test )"
SSL_DEPEND="
>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
"
RDEPEND="
hpack-tools? ( >=dev-libs/jansson-2.5:= )
jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
utils? (
${SSL_DEPEND}
>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
net-dns/c-ares:=[${MULTILIB_USEDEP}]
)
systemd? ( >=sys-apps/systemd-209 )
xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
multilib_src_configure() {
#TODO: enable HTTP3
#requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3
local mycmakeargs=(
-DENABLE_EXAMPLES=OFF
-DENABLE_FAILMALLOC=OFF
-DENABLE_HTTP3=OFF
-DENABLE_WERROR=OFF
-DENABLE_THREADS=ON
-DENABLE_DEBUG=$(usex debug)
-DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools)
$(cmake_use_find_package hpack-tools Jansson)
-DWITH_JEMALLOC=$(multilib_native_usex jemalloc)
-DBUILD_STATIC_LIBS=$(usex static-libs)
-DBUILD_TESTING=$(usex test)
$(cmake_use_find_package systemd Systemd)
-DENABLE_APP=$(multilib_native_usex utils)
-DWITH_LIBXML2=$(multilib_native_usex xml)
)
cmake_src_configure
}
multilib_src_test() {
eninja check
}

View File

@ -35,7 +35,7 @@ RDEPEND="
>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
)
systemd? ( >=sys-apps/systemd-209 )
xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )
xml? ( >=dev-libs/libxml2-2.7.7:2=[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"