public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-libs/nghttp2/, net-libs/nghttp2/files/
@ 2016-02-03 18:52 Mike Frysinger
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-02-03 18:52 UTC (permalink / raw
  To: gentoo-commits

commit:     0f7721952928a967f37a0716b862b541685df177
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  3 18:09:41 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Feb  3 18:51:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f772195

net-libs/nghttp2: drop old <1.6.0 versions

 net-libs/nghttp2/Manifest                          |  2 -
 .../nghttp2/files/nghttp2-1.0.2-third-party.patch  | 34 ------------
 net-libs/nghttp2/nghttp2-1.0.5.ebuild              | 61 ---------------------
 net-libs/nghttp2/nghttp2-1.5.0.ebuild              | 62 ----------------------
 4 files changed, 159 deletions(-)

diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index c69b64b..754c333 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,3 +1 @@
-DIST nghttp2-1.0.5.tar.gz 1356748 SHA256 64e066816606178188bfaf0aa7298e1f44cef943dd9ae936497dab38b3b2569e SHA512 f8b7a79e6174ff501d93333b25954822098d936720a8f4de8a15c83f16c009006aefd05e24977c219661fd63b9fead70eaf5703211bfd9e2bba6a61facbba9c4 WHIRLPOOL 608b1a4494e2aff0c941545c1f49c3c585846d27f5e509ff16c9217309689c47fd7f8fc398b23c83d8aa0ba3f9c2c52af039cd875e47f38630acc50e7c17f717
-DIST nghttp2-1.5.0.tar.gz 1980230 SHA256 ccde0e43cadcef2b81dad4d2ae05559290a2c174e4d2e3e882bd74679895be5c SHA512 6f5c67269277a0fbbe55c2dd18b49abcbc14614495100f715d7b0c61c1947b56cbc20f1f8dd51de5e921363c582c1d867c366b53869a73ad408c072c424a0f63 WHIRLPOOL 74d40e3d77d80d7fb5f7d24559e65dc8d60e60de0f772034beee0fcd6d7e7fab427fb16b69eab85daecbbfb861f77a49e70697338b021982d72d5caf2723b10b
 DIST nghttp2-1.6.0.tar.gz 1983953 SHA256 c88012e87b80c055ddd2412efd7e96b9e8cfe0652c4b21083f2cb89b2f0d3a26 SHA512 32d5227a5ff037d50d93d43b1fdb0be51d9cca1e09dcc85320b8e09f82fdc658397ca58ca400595f138ca7b77f389d945e3562ab4074afd05e1c74eca4de2744 WHIRLPOOL 31102e596a9e93ca993cd9b8b04da6f51acb247803de16958501bdb6fe06e5bbc951430d2c2be1bd7fd1d9216d087d711de83bad6bb93eb70f4e4b8b0f864efb

diff --git a/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch b/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch
deleted file mode 100644
index 9e5323b..0000000
--- a/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 19309823aa5e4e9a65436bbc32430c9092e5d233 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 17 Jun 2015 13:29:37 -0400
-Subject: [PATCH] enable third-party for asio_lib too
-
-Since this library uses the third-party subdir, make sure we auto-enable
-it when that lib is turned on.
----
- configure.ac | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index be51a24..8e81741 100644
---- a/configure
-+++ b/configure
-@@ -464,11 +464,12 @@ fi
- 
- AM_CONDITIONAL([ENABLE_EXAMPLES], [ test "x${enable_examples}" = "xyes" ])
- 
--# third-party only be built if either enable_examples or enable_app is
--# yes
-+# third-party only be built when needed
- 
- enable_third_party=no
--if test "x${enable_examples}" = "xyes" || test "x${enable_app}" = "xyes"; then
-+if test "x${enable_examples}" = "xyes" ||
-+   test "x${enable_app}" = "xyes" ||
-+   test "x${enable_asio_lib}" = "xyes"; then
-   enable_third_party=yes
- fi
- 
--- 
-2.4.1
-

diff --git a/net-libs/nghttp2/nghttp2-1.0.5.ebuild b/net-libs/nghttp2/nghttp2-1.0.5.ebuild
deleted file mode 100644
index 3bacabf..0000000
--- a/net-libs/nghttp2/nghttp2-1.0.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO: Add python support.
-
-EAPI="5"
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
-	inherit git-2
-else
-	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
-
-RDEPEND="
-	cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc )
-	utils? (
-		>=dev-libs/libev-4.15
-		>=dev-libs/openssl-1.0.2[-bindist]
-		>=sys-libs/zlib-1.2.3
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-examples \
-		--disable-failmalloc \
-		--disable-werror \
-		--without-cython \
-		--disable-python-bindings \
-		--without-spdylay \
-		$(use_enable cxx asio-lib) \
-		$(use_enable debug) \
-		$(multilib_native_use_enable hpack-tools) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(multilib_native_use_enable utils app) \
-		$(multilib_native_use_with jemalloc) \
-		$(multilib_native_use_with xml libxml2)
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}" -name '*.la' -delete
-}

diff --git a/net-libs/nghttp2/nghttp2-1.5.0.ebuild b/net-libs/nghttp2/nghttp2-1.5.0.ebuild
deleted file mode 100644
index 776f0f6..0000000
--- a/net-libs/nghttp2/nghttp2-1.5.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO: Add python support.
-
-EAPI="5"
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
-	inherit git-2
-else
-	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-RDEPEND="
-	cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc )
-	utils? (
-		>=dev-libs/libev-4.15
-		!libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist] )
-		libressl? ( dev-libs/libressl )
-		>=sys-libs/zlib-1.2.3
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-examples \
-		--disable-failmalloc \
-		--disable-werror \
-		--without-cython \
-		--disable-python-bindings \
-		--without-spdylay \
-		$(use_enable cxx asio-lib) \
-		$(use_enable debug) \
-		$(multilib_native_use_enable hpack-tools) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(multilib_native_use_enable utils app) \
-		$(multilib_native_use_with jemalloc) \
-		$(multilib_native_use_with xml libxml2)
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}" -name '*.la' -delete
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/nghttp2/, net-libs/nghttp2/files/
@ 2022-07-16 17:39 Bernard Cafarelli
  0 siblings, 0 replies; 5+ messages in thread
From: Bernard Cafarelli @ 2022-07-16 17:39 UTC (permalink / raw
  To: gentoo-commits

commit:     030bc1d72594dbfe868e3f482def0a8579566526
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 17:38:02 2022 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 17:38:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030bc1d7

net-libs/nghttp2: move patch to distfiles (24KB)

Also fix eautoreconf not being called, clean conditionals on live ebuild

Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 net-libs/nghttp2/Manifest                          |   1 +
 .../nghttp2/files/nghttp2-1.48.0-pthread.patch     | 576 ---------------------
 net-libs/nghttp2/nghttp2-1.48.0.ebuild             |  17 +-
 net-libs/nghttp2/nghttp2-9999.ebuild               |  14 +-
 4 files changed, 10 insertions(+), 598 deletions(-)

diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 67ff6f04b834..233caae41953 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,2 +1,3 @@
 DIST nghttp2-1.47.0.tar.xz 4028580 BLAKE2B 4f5302701c8d8a89c3ae72cbb8acb4cbcbe32cd0e2995643e0b669cf802ae28e8f6e52b2d59f69f87e0d12fc64a73c251edbe01c2b0eca2676626a9e456df93f SHA512 ad6266a15789fec966db6be8ac0b9ee6cca257a3bb91fdd34a58acf0e472643a571941b5974d16c98f6ac5bfa6a03c4b70a6dff222fb0cd50909178b7e94ce48
+DIST nghttp2-1.48.0-pthread.patch 24917 BLAKE2B 22013d89685be603094aa82f69da8741d4c0d76aea8a01de1322c19cef053964fdf0bec937650382f85607ac74466d4d052e6d40217101bc1e40326ad0ddc003 SHA512 bdebc50f13584826d6693aae201db9be63fcadcb8a68af188e94f008e005a2fd6aa6b91b31de2f07f84b93d981a003c8752c5fb4d47502f768bd94e21635627f
 DIST nghttp2-1.48.0.tar.xz 4112072 BLAKE2B a52dc1ef4c9658298acef5ad703bec1708e538ebe19584dd5fcfe39089777e105594a998c7db696ee54bc8f17d3086828c09e921d8714b7ad3efbf33d04aaca0 SHA512 77c22371290f77e8a538b9efea225d23567cc27cb60b71703cbcb057839b5f117cf50796aa82bf4518f22b38a5773e90a1c273eafff4b17c435ac5858bdf7c6f

diff --git a/net-libs/nghttp2/files/nghttp2-1.48.0-pthread.patch b/net-libs/nghttp2/files/nghttp2-1.48.0-pthread.patch
deleted file mode 100644
index b3c5ad2ad1aa..000000000000
--- a/net-libs/nghttp2/files/nghttp2-1.48.0-pthread.patch
+++ /dev/null
@@ -1,576 +0,0 @@
-From 9051916665843b144fb176a122fe0ea3c9192e64 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Thu, 18 Mar 2021 08:29:19 -0700
-Subject: [PATCH] build: Fix undefined pthread references.
-
----
- configure.ac     |   9 +-
- lib/Makefile.am  |   1 +
- m4/ax_pthread.m4 | 507 +++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 511 insertions(+), 6 deletions(-)
- create mode 100644 m4/ax_pthread.m4
-
-diff --git a/configure.ac b/configure.ac
-index 18ed382496..17401d0e03 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -322,10 +322,6 @@ case "$host_os" in
-     # android does not need -pthread, but needs followng 3 libs for C++
-     APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
-     ;;
--  *)
--    PTHREAD_LDFLAGS="-pthread"
--    APPLDFLAGS="$APPLDFLAGS $PTHREAD_LDFLAGS"
--    ;;
- esac
- 
- case "$host_os" in
-@@ -531,14 +527,14 @@ if test "x${request_jemalloc}" != "xno"; then
-   if test "x${JEMALLOC_LIBS}" = "x" && test "x${JEMALLOC_CFLAGS}" = "x"; then
-     save_LIBS=$LIBS
-     AC_SEARCH_LIBS([malloc_stats_print], [jemalloc], [have_jemalloc=yes], [],
--                   [$PTHREAD_LDFLAGS])
-+                   [])
- 
-     if test "x${have_jemalloc}" = "xyes"; then
-       jemalloc_libs=${ac_cv_search_malloc_stats_print}
-     else
-       # On Darwin, malloc_stats_print is je_malloc_stats_print
-       AC_SEARCH_LIBS([je_malloc_stats_print], [jemalloc], [have_jemalloc=yes], [],
--                     [$PTHREAD_LDFLAGS])
-+                     [])
- 
-       if test "x${have_jemalloc}" = "xyes"; then
-         jemalloc_libs=${ac_cv_search_je_malloc_stats_print}
-@@ -568,6 +564,7 @@ if test "x${request_asio_lib}" = "xyes"; then
-   AX_BOOST_BASE([1.54.0], [have_boost_base=yes], [have_boost_base=no])
- 
-   if test "x${have_boost_base}" = "xyes"; then
-+    AX_PTHREAD
-     AX_BOOST_ASIO()
-     AX_BOOST_SYSTEM()
-     AX_BOOST_THREAD()
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index bb2691f0c8..936689c65e 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -71,5 +71,6 @@ HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
- 	nghttp2_ksl.h
- 
- libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS)
-+libnghttp2_la_LIBADD = $(PTHREAD_LIBS)
- libnghttp2_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined \
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
-new file mode 100644
-index 0000000000..1598d077ff
---- /dev/null
-+++ b/m4/ax_pthread.m4
-@@ -0,0 +1,507 @@
-+# ===========================================================================
-+#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+#   This macro figures out how to build C programs using POSIX threads. It
-+#   sets the PTHREAD_LIBS output variable to the threads library and linker
-+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-+#   flags that are needed. (The user can also force certain compiler
-+#   flags/libs to be tested by setting these environment variables.)
-+#
-+#   Also sets PTHREAD_CC to any special C compiler that is needed for
-+#   multi-threaded programs (defaults to the value of CC otherwise). (This
-+#   is necessary on AIX to use the special cc_r compiler alias.)
-+#
-+#   NOTE: You are assumed to not only compile your program with these flags,
-+#   but also to link with them as well. For example, you might link with
-+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-+#
-+#   If you are only building threaded programs, you may wish to use these
-+#   variables in your default LIBS, CFLAGS, and CC:
-+#
-+#     LIBS="$PTHREAD_LIBS $LIBS"
-+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+#     CC="$PTHREAD_CC"
-+#
-+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-+#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
-+#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-+#
-+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-+#   PTHREAD_CFLAGS.
-+#
-+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-+#   is not found. If ACTION-IF-FOUND is not specified, the default action
-+#   will define HAVE_PTHREAD.
-+#
-+#   Please let the authors know if this macro fails on any platform, or if
-+#   you have any other suggestions or comments. This macro was based on work
-+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-+#   grateful for the helpful feedback of numerous users.
-+#
-+#   Updated for Autoconf 2.68 by Daniel Richard G.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-+#   Copyright (c) 2019 Marc Stevens <marc.stevens@cwi.nl>
-+#
-+#   This program is free software: you can redistribute it and/or modify it
-+#   under the terms of the GNU General Public License as published by the
-+#   Free Software Foundation, either version 3 of the License, or (at your
-+#   option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful, but
-+#   WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+#   Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program. If not, see <https://www.gnu.org/licenses/>.
-+#
-+#   As a special exception, the respective Autoconf Macro's copyright owner
-+#   gives unlimited permission to copy, distribute and modify the configure
-+#   scripts that are the output of Autoconf when processing the Macro. You
-+#   need not follow the terms of the GNU General Public License when using
-+#   or distributing such scripts, even though portions of the text of the
-+#   Macro appear in them. The GNU General Public License (GPL) does govern
-+#   all other use of the material that constitutes the Autoconf Macro.
-+#
-+#   This special exception to the GPL applies to versions of the Autoconf
-+#   Macro released by the Autoconf Archive. When you make and distribute a
-+#   modified version of the Autoconf Macro, you may extend this special
-+#   exception to the GPL to apply to your modified version as well.
-+
-+#serial 27
-+
-+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-+AC_DEFUN([AX_PTHREAD], [
-+AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([AC_PROG_CC])
-+AC_REQUIRE([AC_PROG_SED])
-+AC_LANG_PUSH([C])
-+ax_pthread_ok=no
-+
-+# We used to check for pthread.h first, but this fails if pthread.h
-+# requires special compiler flags (e.g. on Tru64 or Sequent).
-+# It gets checked for in the link test anyway.
-+
-+# First of all, check if the user has set any of the PTHREAD_LIBS,
-+# etcetera environment variables, and if threads linking works using
-+# them:
-+if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-+        ax_pthread_save_CC="$CC"
-+        ax_pthread_save_CFLAGS="$CFLAGS"
-+        ax_pthread_save_LIBS="$LIBS"
-+        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
-+        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
-+        AC_MSG_RESULT([$ax_pthread_ok])
-+        if test "x$ax_pthread_ok" = "xno"; then
-+                PTHREAD_LIBS=""
-+                PTHREAD_CFLAGS=""
-+        fi
-+        CC="$ax_pthread_save_CC"
-+        CFLAGS="$ax_pthread_save_CFLAGS"
-+        LIBS="$ax_pthread_save_LIBS"
-+fi
-+
-+# We must check for the threads library under a number of different
-+# names; the ordering is very important because some systems
-+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-+# libraries is broken (non-POSIX).
-+
-+# Create a list of thread flags to try. Items with a "," contain both
-+# C compiler flags (before ",") and linker flags (after ","). Other items
-+# starting with a "-" are C compiler flags, and remaining items are
-+# library names, except for "none" which indicates that we try without
-+# any flags at all, and "pthread-config" which is a program returning
-+# the flags for the Pth emulation library.
-+
-+ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-+
-+# The ordering *is* (sometimes) important.  Some notes on the
-+# individual items follow:
-+
-+# pthreads: AIX (must check this before -lpthread)
-+# none: in case threads are in libc; should be tried before -Kthread and
-+#       other compiler flags to prevent continual compiler warnings
-+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
-+#           (Note: HP C rejects this with "bad form for `-t' option")
-+# -pthreads: Solaris/gcc (Note: HP C also rejects)
-+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-+#      doesn't hurt to check since this sometimes defines pthreads and
-+#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
-+#      is present but should not be used directly; and before -mthreads,
-+#      because the compiler interprets this as "-mt" + "-hreads")
-+# -mthreads: Mingw32/gcc, Lynx/gcc
-+# pthread: Linux, etcetera
-+# --thread-safe: KAI C++
-+# pthread-config: use pthread-config program (for GNU Pth library)
-+
-+case $host_os in
-+
-+        freebsd*)
-+
-+        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-+        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-+
-+        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-+        ;;
-+
-+        hpux*)
-+
-+        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
-+        # multi-threading and also sets -lpthread."
-+
-+        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-+        ;;
-+
-+        openedition*)
-+
-+        # IBM z/OS requires a feature-test macro to be defined in order to
-+        # enable POSIX threads at all, so give the user a hint if this is
-+        # not set. (We don't define these ourselves, as they can affect
-+        # other portions of the system API in unpredictable ways.)
-+
-+        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
-+            [
-+#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-+             AX_PTHREAD_ZOS_MISSING
-+#            endif
-+            ],
-+            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
-+        ;;
-+
-+        solaris*)
-+
-+        # On Solaris (at least, for some versions), libc contains stubbed
-+        # (non-functional) versions of the pthreads routines, so link-based
-+        # tests will erroneously succeed. (N.B.: The stubs are missing
-+        # pthread_cleanup_push, or rather a function called by this macro,
-+        # so we could check for that, but who knows whether they'll stub
-+        # that too in a future libc.)  So we'll check first for the
-+        # standard Solaris way of linking pthreads (-mt -lpthread).
-+
-+        ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
-+        ;;
-+esac
-+
-+# Are we compiling with Clang?
-+
-+AC_CACHE_CHECK([whether $CC is Clang],
-+    [ax_cv_PTHREAD_CLANG],
-+    [ax_cv_PTHREAD_CLANG=no
-+     # Note that Autoconf sets GCC=yes for Clang as well as GCC
-+     if test "x$GCC" = "xyes"; then
-+        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
-+            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-+#            if defined(__clang__) && defined(__llvm__)
-+             AX_PTHREAD_CC_IS_CLANG
-+#            endif
-+            ],
-+            [ax_cv_PTHREAD_CLANG=yes])
-+     fi
-+    ])
-+ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
-+
-+
-+# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
-+
-+# Note that for GCC and Clang -pthread generally implies -lpthread,
-+# except when -nostdlib is passed.
-+# This is problematic using libtool to build C++ shared libraries with pthread:
-+# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
-+# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333
-+# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555
-+# To solve this, first try -pthread together with -lpthread for GCC
-+
-+AS_IF([test "x$GCC" = "xyes"],
-+      [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"])
-+
-+# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first
-+
-+AS_IF([test "x$ax_pthread_clang" = "xyes"],
-+      [ax_pthread_flags="-pthread,-lpthread -pthread"])
-+
-+
-+# The presence of a feature test macro requesting re-entrant function
-+# definitions is, on some systems, a strong hint that pthreads support is
-+# correctly enabled
-+
-+case $host_os in
-+        darwin* | hpux* | linux* | osf* | solaris*)
-+        ax_pthread_check_macro="_REENTRANT"
-+        ;;
-+
-+        aix*)
-+        ax_pthread_check_macro="_THREAD_SAFE"
-+        ;;
-+
-+        *)
-+        ax_pthread_check_macro="--"
-+        ;;
-+esac
-+AS_IF([test "x$ax_pthread_check_macro" = "x--"],
-+      [ax_pthread_check_cond=0],
-+      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
-+
-+
-+if test "x$ax_pthread_ok" = "xno"; then
-+for ax_pthread_try_flag in $ax_pthread_flags; do
-+
-+        case $ax_pthread_try_flag in
-+                none)
-+                AC_MSG_CHECKING([whether pthreads work without any flags])
-+                ;;
-+
-+                *,*)
-+                PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"`
-+                PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"`
-+                AC_MSG_CHECKING([whether pthreads work with "$PTHREAD_CFLAGS" and "$PTHREAD_LIBS"])
-+                ;;
-+
-+                -*)
-+                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
-+                PTHREAD_CFLAGS="$ax_pthread_try_flag"
-+                ;;
-+
-+                pthread-config)
-+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-+                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
-+                PTHREAD_CFLAGS="`pthread-config --cflags`"
-+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-+                ;;
-+
-+                *)
-+                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
-+                PTHREAD_LIBS="-l$ax_pthread_try_flag"
-+                ;;
-+        esac
-+
-+        ax_pthread_save_CFLAGS="$CFLAGS"
-+        ax_pthread_save_LIBS="$LIBS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+
-+        # Check for various functions.  We must include pthread.h,
-+        # since some functions may be macros.  (On the Sequent, we
-+        # need a special flag -Kthread to make this header compile.)
-+        # We check for pthread_join because it is in -lpthread on IRIX
-+        # while pthread_create is in libc.  We check for pthread_attr_init
-+        # due to DEC craziness with -lpthreads.  We check for
-+        # pthread_cleanup_push because it is one of the few pthread
-+        # functions on Solaris that doesn't have a non-functional libc stub.
-+        # We try pthread_create on general principles.
-+
-+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-+#                       if $ax_pthread_check_cond
-+#                        error "$ax_pthread_check_macro must be defined"
-+#                       endif
-+                        static void *some_global = NULL;
-+                        static void routine(void *a)
-+                          {
-+                             /* To avoid any unused-parameter or
-+                                unused-but-set-parameter warning.  */
-+                             some_global = a;
-+                          }
-+                        static void *start_routine(void *a) { return a; }],
-+                       [pthread_t th; pthread_attr_t attr;
-+                        pthread_create(&th, 0, start_routine, 0);
-+                        pthread_join(th, 0);
-+                        pthread_attr_init(&attr);
-+                        pthread_cleanup_push(routine, 0);
-+                        pthread_cleanup_pop(0) /* ; */])],
-+            [ax_pthread_ok=yes],
-+            [])
-+
-+        CFLAGS="$ax_pthread_save_CFLAGS"
-+        LIBS="$ax_pthread_save_LIBS"
-+
-+        AC_MSG_RESULT([$ax_pthread_ok])
-+        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
-+
-+        PTHREAD_LIBS=""
-+        PTHREAD_CFLAGS=""
-+done
-+fi
-+
-+
-+# Clang needs special handling, because older versions handle the -pthread
-+# option in a rather... idiosyncratic way
-+
-+if test "x$ax_pthread_clang" = "xyes"; then
-+
-+        # Clang takes -pthread; it has never supported any other flag
-+
-+        # (Note 1: This will need to be revisited if a system that Clang
-+        # supports has POSIX threads in a separate library.  This tends not
-+        # to be the way of modern systems, but it's conceivable.)
-+
-+        # (Note 2: On some systems, notably Darwin, -pthread is not needed
-+        # to get POSIX threads support; the API is always present and
-+        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-+        # -pthread does define _REENTRANT, and while the Darwin headers
-+        # ignore this macro, third-party headers might not.)
-+
-+        # However, older versions of Clang make a point of warning the user
-+        # that, in an invocation where only linking and no compilation is
-+        # taking place, the -pthread option has no effect ("argument unused
-+        # during compilation").  They expect -pthread to be passed in only
-+        # when source code is being compiled.
-+        #
-+        # Problem is, this is at odds with the way Automake and most other
-+        # C build frameworks function, which is that the same flags used in
-+        # compilation (CFLAGS) are also used in linking.  Many systems
-+        # supported by AX_PTHREAD require exactly this for POSIX threads
-+        # support, and in fact it is often not straightforward to specify a
-+        # flag that is used only in the compilation phase and not in
-+        # linking.  Such a scenario is extremely rare in practice.
-+        #
-+        # Even though use of the -pthread flag in linking would only print
-+        # a warning, this can be a nuisance for well-run software projects
-+        # that build with -Werror.  So if the active version of Clang has
-+        # this misfeature, we search for an option to squash it.
-+
-+        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
-+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
-+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-+             # Create an alternate version of $ac_link that compiles and
-+             # links in two steps (.c -> .o, .o -> exe) instead of one
-+             # (.c -> exe), because the warning occurs only in the second
-+             # step
-+             ax_pthread_save_ac_link="$ac_link"
-+             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-+             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
-+             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-+             ax_pthread_save_CFLAGS="$CFLAGS"
-+             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-+                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
-+                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-+                ac_link="$ax_pthread_save_ac_link"
-+                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-+                    [ac_link="$ax_pthread_2step_ac_link"
-+                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-+                         [break])
-+                    ])
-+             done
-+             ac_link="$ax_pthread_save_ac_link"
-+             CFLAGS="$ax_pthread_save_CFLAGS"
-+             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
-+             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
-+            ])
-+
-+        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-+                no | unknown) ;;
-+                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-+        esac
-+
-+fi # $ax_pthread_clang = yes
-+
-+
-+
-+# Various other checks:
-+if test "x$ax_pthread_ok" = "xyes"; then
-+        ax_pthread_save_CFLAGS="$CFLAGS"
-+        ax_pthread_save_LIBS="$LIBS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+
-+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-+        AC_CACHE_CHECK([for joinable pthread attribute],
-+            [ax_cv_PTHREAD_JOINABLE_ATTR],
-+            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-+             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-+                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-+                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
-+                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
-+                                [])
-+             done
-+            ])
-+        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-+               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-+               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
-+              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
-+                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
-+                                  [Define to necessary symbol if this constant
-+                                   uses a non-standard name on your system.])
-+               ax_pthread_joinable_attr_defined=yes
-+              ])
-+
-+        AC_CACHE_CHECK([whether more special flags are required for pthreads],
-+            [ax_cv_PTHREAD_SPECIAL_FLAGS],
-+            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
-+             case $host_os in
-+             solaris*)
-+             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-+             ;;
-+             esac
-+            ])
-+        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-+               test "x$ax_pthread_special_flags_added" != "xyes"],
-+              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-+               ax_pthread_special_flags_added=yes])
-+
-+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-+            [ax_cv_PTHREAD_PRIO_INHERIT],
-+            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-+                                             [[int i = PTHREAD_PRIO_INHERIT;
-+                                               return i;]])],
-+                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-+                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
-+            ])
-+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-+               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
-+              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
-+               ax_pthread_prio_inherit_defined=yes
-+              ])
-+
-+        CFLAGS="$ax_pthread_save_CFLAGS"
-+        LIBS="$ax_pthread_save_LIBS"
-+
-+        # More AIX lossage: compile with *_r variant
-+        if test "x$GCC" != "xyes"; then
-+            case $host_os in
-+                aix*)
-+                AS_CASE(["x/$CC"],
-+                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-+                    [#handle absolute path differently from PATH based program lookup
-+                     AS_CASE(["x$CC"],
-+                         [x/*],
-+                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-+                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-+                ;;
-+            esac
-+        fi
-+fi
-+
-+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-+
-+AC_SUBST([PTHREAD_LIBS])
-+AC_SUBST([PTHREAD_CFLAGS])
-+AC_SUBST([PTHREAD_CC])
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test "x$ax_pthread_ok" = "xyes"; then
-+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-+        :
-+else
-+        ax_pthread_ok=no
-+        $2
-+fi
-+AC_LANG_POP
-+])dnl AX_PTHREAD

diff --git a/net-libs/nghttp2/nghttp2-1.48.0.ebuild b/net-libs/nghttp2/nghttp2-1.48.0.ebuild
index 12c096a2127b..3d7864b42e52 100644
--- a/net-libs/nghttp2/nghttp2-1.48.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.48.0.ebuild
@@ -5,21 +5,16 @@
 
 EAPI=8
 
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
+inherit autotools multilib-minimal
 
 DESCRIPTION="HTTP/2 C Library"
 HOMEPAGE="https://nghttp2.org/"
+SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~voyageur/distfiles/${P}-pthread.patch"
 
 LICENSE="MIT"
 SLOT="0/1.14" # <C++>.<C> SONAMEs
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
 
 RESTRICT="!test? ( test )"
@@ -46,13 +41,11 @@ DEPEND="${RDEPEND}
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-pthread.patch
+	"${DISTDIR}"/${P}-pthread.patch
 	)
 
 src_prepare() {
 	default
-	# Restore when patch is merged/dropped
-	#[[ ${PV} == 9999 ]] && eautoreconf
 	eautoreconf
 }
 

diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index fc3c9a321036..44a9ccc69a4e 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -5,21 +5,15 @@
 
 EAPI=8
 
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
+inherit autotools git-r3 multilib-minimal
 
 DESCRIPTION="HTTP/2 C Library"
 HOMEPAGE="https://nghttp2.org/"
+EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
 
 LICENSE="MIT"
 SLOT="0/1.14" # <C++>.<C> SONAMEs
+KEYWORDS=""
 IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
 
 RESTRICT="!test? ( test )"
@@ -47,7 +41,7 @@ BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 multilib_src_configure() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/nghttp2/, net-libs/nghttp2/files/
@ 2024-12-13 14:06 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-12-13 14:06 UTC (permalink / raw
  To: gentoo-commits

commit:     a7dfda3569459f3ea16b905260e22a3115bfc595
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 14:05:59 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 14:06:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7dfda35

net-libs/nghttp2: fix build (of tests) w/ c23

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../nghttp2/files/nghttp2-1.64.0-munit-c23.patch   | 28 ++++++++++++++++++++++
 net-libs/nghttp2/nghttp2-1.64.0.ebuild             |  4 ++++
 2 files changed, 32 insertions(+)

diff --git a/net-libs/nghttp2/files/nghttp2-1.64.0-munit-c23.patch b/net-libs/nghttp2/files/nghttp2-1.64.0-munit-c23.patch
new file mode 100644
index 000000000000..93d208fa4215
--- /dev/null
+++ b/net-libs/nghttp2/files/nghttp2-1.64.0-munit-c23.patch
@@ -0,0 +1,28 @@
+https://github.com/nemequ/munit/pull/105
+--- a/tests/munit/munit.c
++++ b/tests/munit/munit.c
+@@ -858,23 +858,18 @@ static psnip_uint64_t munit_clock_get_elapsed(struct PsnipClockTimespec *start,
+ 
+ #if defined(_OPENMP)
+ #  define ATOMIC_UINT32_T uint32_t
+-#  define ATOMIC_UINT32_INIT(x) (x)
+ #elif defined(HAVE_STDATOMIC)
+ #  include <stdatomic.h>
+ #  define ATOMIC_UINT32_T _Atomic uint32_t
+-#  define ATOMIC_UINT32_INIT(x) ATOMIC_VAR_INIT(x)
+ #elif defined(HAVE_CLANG_ATOMICS)
+ #  define ATOMIC_UINT32_T _Atomic uint32_t
+-#  define ATOMIC_UINT32_INIT(x) (x)
+ #elif defined(_WIN32)
+ #  define ATOMIC_UINT32_T volatile LONG
+-#  define ATOMIC_UINT32_INIT(x) (x)
+ #else
+ #  define ATOMIC_UINT32_T volatile uint32_t
+-#  define ATOMIC_UINT32_INIT(x) (x)
+ #endif
+ 
+-static ATOMIC_UINT32_T munit_rand_state = ATOMIC_UINT32_INIT(42);
++static ATOMIC_UINT32_T munit_rand_state = 42;
+ 
+ #if defined(_OPENMP)
+ static inline void munit_atomic_store(ATOMIC_UINT32_T *dest,

diff --git a/net-libs/nghttp2/nghttp2-1.64.0.ebuild b/net-libs/nghttp2/nghttp2-1.64.0.ebuild
index 040b77645d76..1c37ea0ab83d 100644
--- a/net-libs/nghttp2/nghttp2-1.64.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.64.0.ebuild
@@ -34,6 +34,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.64.0-munit-c23.patch
+)
+
 multilib_src_configure() {
 	#TODO: enable HTTP3
 	#requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/nghttp2/, net-libs/nghttp2/files/
@ 2025-01-03  1:50 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2025-01-03  1:50 UTC (permalink / raw
  To: gentoo-commits

commit:     867f9e2a3b843ce41678f8dc0cbadf7a0f2a4207
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 01:48:22 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 01:48:22 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=867f9e2a

net-libs/nghttp2: drop 1.61.0, 1.62.0, 1.63.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/nghttp2/Manifest                         |  3 --
 net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch | 38 -------------
 net-libs/nghttp2/nghttp2-1.61.0.ebuild            | 61 ---------------------
 net-libs/nghttp2/nghttp2-1.62.0.ebuild            | 61 ---------------------
 net-libs/nghttp2/nghttp2-1.63.0.ebuild            | 65 -----------------------
 5 files changed, 228 deletions(-)

diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 5e463bc86bd7..b3a44115c6e1 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,5 +1,2 @@
-DIST nghttp2-1.61.0.tar.xz 1645808 BLAKE2B e78fb94cc9234260447f0d3610e58e22f9eadc2dd8b79eec3c1bb10d5c03ad3a87f83d54e560e5bbdef5d60086c00b465caabca145485ecd636aa35a2cda616f SHA512 01e930d7caf464699505f92b76e2bc8192d168612dc564d2546812c42afea2fb81d552d70e8a5fed35e2bf5deadbec8eda095af94a2484bca41542988afce52a
-DIST nghttp2-1.62.0.tar.xz 1646596 BLAKE2B 156fe3cd401e89cb9416c3281318f955abe86909d249108781f8eaeb0ff3df791f083ae6fc7bfe04350b91ffeaf8d8799d138d9d7cc9f5121a344f69f7473915 SHA512 1674e269dcf1067312056e5ea0e7108a48a177888fbaae5a194bddcc9640babc996d86e74e3160cd0dc4a360f0440441116259f3b44a3ca5fea081cdff7e7c88
 DIST nghttp2-1.62.1.tar.xz 1606084 BLAKE2B 460152f08b4ebd98453b95b737e0729648b95e808e845114a47a23e39fb3c68bf5d165d71467fbca8069fd5e64a63eeedd025919af4e2186da083caa21b93130 SHA512 d5d6b068712e9b467547b0e5380465b8540317134f3f26c2b0c60eb9c604be2f37b4517a98b371d5f5fb668ce2ee35603ddd944224f11e96382aa541a6a17b4c
-DIST nghttp2-1.63.0.tar.xz 1606480 BLAKE2B 8c4158b8855b3b4b0a576f5cc894f77f88bab35bbb995809c7494bd73030d50d0189153ef5434a3071267bc6f198ea3ff5d7e3bd8bac4299fb8fbf3be91e11c7 SHA512 ac5005f33664981e194730223881f4207c9570cb8d9bba51b5592a3e7eb59455ebe25bf190211811513c64497a1b42ec7a82cc7f810059f46c99a83dd2d6cef9
 DIST nghttp2-1.64.0.tar.xz 1676124 BLAKE2B e2cad95fbe8447e99728af3ad7656d4dd2d1f51f31294bd38b6c69ee07e6e8e6302c124d47e6274a9a1531257a90bcc5833de390ac704b4b3adf435b9ce38fc9 SHA512 b544196c3b7a55faacd11700d11e2fe4f16a7418282c9abb24a668544a15293580fd1a2cc5f93367c8a17c7ee45335c6d2f5c68a72dd176d516fd033f203eeec

diff --git a/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch b/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch
deleted file mode 100644
index ed5286673211..000000000000
--- a/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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)
-

diff --git a/net-libs/nghttp2/nghttp2-1.61.0.ebuild b/net-libs/nghttp2/nghttp2-1.61.0.ebuild
deleted file mode 100644
index ea8616811ed6..000000000000
--- a/net-libs/nghttp2/nghttp2-1.61.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 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
-}

diff --git a/net-libs/nghttp2/nghttp2-1.62.0.ebuild b/net-libs/nghttp2/nghttp2-1.62.0.ebuild
deleted file mode 100644
index 040b77645d76..000000000000
--- a/net-libs/nghttp2/nghttp2-1.62.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 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
-}

diff --git a/net-libs/nghttp2/nghttp2-1.63.0.ebuild b/net-libs/nghttp2/nghttp2-1.63.0.ebuild
deleted file mode 100644
index 54c2599e4f59..000000000000
--- a/net-libs/nghttp2/nghttp2-1.63.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 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"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cares.patch
-)
-
-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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-libs/nghttp2/, net-libs/nghttp2/files/
@ 2025-03-18  1:13 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2025-03-18  1:13 UTC (permalink / raw
  To: gentoo-commits

commit:     1989ba2abdbc66debdc3f48f4664d6227eb46a8b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 18 01:10:42 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 18 01:10:42 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1989ba2a

net-libs/nghttp2: drop 1.64.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/nghttp2/Manifest                          |  1 -
 .../nghttp2/files/nghttp2-1.64.0-munit-c23.patch   | 28 ----------
 net-libs/nghttp2/nghttp2-1.64.0.ebuild             | 65 ----------------------
 3 files changed, 94 deletions(-)

diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 5ade248bb18d..1247dc823c83 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,2 +1 @@
-DIST nghttp2-1.64.0.tar.xz 1676124 BLAKE2B e2cad95fbe8447e99728af3ad7656d4dd2d1f51f31294bd38b6c69ee07e6e8e6302c124d47e6274a9a1531257a90bcc5833de390ac704b4b3adf435b9ce38fc9 SHA512 b544196c3b7a55faacd11700d11e2fe4f16a7418282c9abb24a668544a15293580fd1a2cc5f93367c8a17c7ee45335c6d2f5c68a72dd176d516fd033f203eeec
 DIST nghttp2-1.65.0.tar.xz 1604848 BLAKE2B 8fb752f55936110a8b5c27873e7e262a0c84740beac46444a80596e25b256ca3a4b0f0cc97a91e104a0f1c59ac0304546310a2817af126efabd2ce26cfd0ee06 SHA512 e1ef685a425017474ea0412c8ad13a217a45a320322b3aee48e646be21457d9b1f374abb9f681f47595a0ad8feb07d076bd0aa3279d35c5c9b5b8c921d8dd39e

diff --git a/net-libs/nghttp2/files/nghttp2-1.64.0-munit-c23.patch b/net-libs/nghttp2/files/nghttp2-1.64.0-munit-c23.patch
deleted file mode 100644
index 93d208fa4215..000000000000
--- a/net-libs/nghttp2/files/nghttp2-1.64.0-munit-c23.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/nemequ/munit/pull/105
---- a/tests/munit/munit.c
-+++ b/tests/munit/munit.c
-@@ -858,23 +858,18 @@ static psnip_uint64_t munit_clock_get_elapsed(struct PsnipClockTimespec *start,
- 
- #if defined(_OPENMP)
- #  define ATOMIC_UINT32_T uint32_t
--#  define ATOMIC_UINT32_INIT(x) (x)
- #elif defined(HAVE_STDATOMIC)
- #  include <stdatomic.h>
- #  define ATOMIC_UINT32_T _Atomic uint32_t
--#  define ATOMIC_UINT32_INIT(x) ATOMIC_VAR_INIT(x)
- #elif defined(HAVE_CLANG_ATOMICS)
- #  define ATOMIC_UINT32_T _Atomic uint32_t
--#  define ATOMIC_UINT32_INIT(x) (x)
- #elif defined(_WIN32)
- #  define ATOMIC_UINT32_T volatile LONG
--#  define ATOMIC_UINT32_INIT(x) (x)
- #else
- #  define ATOMIC_UINT32_T volatile uint32_t
--#  define ATOMIC_UINT32_INIT(x) (x)
- #endif
- 
--static ATOMIC_UINT32_T munit_rand_state = ATOMIC_UINT32_INIT(42);
-+static ATOMIC_UINT32_T munit_rand_state = 42;
- 
- #if defined(_OPENMP)
- static inline void munit_atomic_store(ATOMIC_UINT32_T *dest,

diff --git a/net-libs/nghttp2/nghttp2-1.64.0.ebuild b/net-libs/nghttp2/nghttp2-1.64.0.ebuild
deleted file mode 100644
index d29f89a46402..000000000000
--- a/net-libs/nghttp2/nghttp2-1.64.0.ebuild
+++ /dev/null
@@ -1,65 +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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.64.0-munit-c23.patch
-)
-
-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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2025-03-18  1:13 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-03  1:50 [gentoo-commits] repo/gentoo:master commit in: net-libs/nghttp2/, net-libs/nghttp2/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2025-03-18  1:13 Sam James
2024-12-13 14:06 Sam James
2022-07-16 17:39 Bernard Cafarelli
2016-02-03 18:52 Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox