mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-15 00:46:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

net-libs/nghttp2: Sync with Gentoo

Browse Source 
It's from Gentoo commit cfad6d83e575e0ecd778b8068f2d8fed9eb94f08.
This commit is contained in:
Flatcar Buildbot 2024-10-21 07:07:55 +00:00
parent 2c0aa393c5
commit b74cea1cc2
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sdk_container/src/third_party/portage-stable/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch vendored Normal file
View File

@ -0,0 +1,38 @@
https://bugs.gentoo.org/941453
https://github.com/nghttp2/nghttp2/issues/2253
https://github.com/nghttp2/nghttp2/pull/2256
https://github.com/nghttp2/nghttp2/commit/1ee4636528b1a8ea6769496750dda05f12104fa8
From 1ee4636528b1a8ea6769496750dda05f12104fa8 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Tue, 15 Oct 2024 19:25:12 +0900
Subject: [PATCH] cmake: Fix c-ares v1.34.0 version detection failure
--- a/cmake/FindLibcares.cmake
+++ b/cmake/FindLibcares.cmake
@@ -17,12 +17,18 @@ find_library(LIBCARES_LIBRARY
)
if(LIBCARES_INCLUDE_DIR)
- set(_version_regex "^#define[ \t]+ARES_VERSION_STR[ \t]+\"([^\"]+)\".*")
- file(STRINGS "${LIBCARES_INCLUDE_DIR}/ares_version.h"
- LIBCARES_VERSION REGEX "${_version_regex}")
- string(REGEX REPLACE "${_version_regex}" "\\1"
- LIBCARES_VERSION "${LIBCARES_VERSION}")
- unset(_version_regex)
+ file(READ "${LIBCARES_INCLUDE_DIR}/ares_version.h" _ares_version_h)
+ string(REGEX REPLACE ".*#define[ \t]+ARES_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1"
+ _ares_version_major ${_ares_version_h})
+ string(REGEX REPLACE ".*#define[ \t]+ARES_VERSION_MINOR[ \t]+([0-9]+).*" "\\1"
+ _ares_version_minor ${_ares_version_h})
+ string(REGEX REPLACE ".*#define[ \t]+ARES_VERSION_PATCH[ \t]+([0-9]+).*" "\\1"
+ _ares_version_patch ${_ares_version_h})
+ set(LIBCARES_VERSION "${_ares_version_major}.${_ares_version_minor}.${_ares_version_patch}")
+ unset(_ares_version_patch)
+ unset(_ares_version_minor)
+ unset(_ares_version_major)
+ unset(_ares_version_h)
endif()
include(FindPackageHandleStandardArgs)

4
sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.63.0.ebuild vendored
View File

@ -34,6 +34,10 @@ RDEPEND="
DEPEND="${RDEPEND}" DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig" BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-cares.patch
)
multilib_src_configure() { multilib_src_configure() {
#TODO: enable HTTP3 #TODO: enable HTTP3
#requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3 #requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3