On Tue, Nov 08, 2022 at 08:16:25PM +0100, Christian Weisgerber wrote:
> In principle, I'm fine with adding QUIC support to curl, and the
> new dependencies don't seem that onerous.
Thanks.
> nghttp3 needs --disable-examples, otherwise it tries to build
> something with C++17, which I expect to prove problematic on our
> remaining supported gcc4 arch.
I don't know how I missed -std=c++17. The attached tarball has
--with-lib-only to disable the examples.
> > The cunit handling in the two new ports is taken from nghttp2, which may
> > or may not be needed anymore.
It does what it says on the tin: if cunit isn't present, install it and
rebuild before running tests... Let's land the ports and deal with the
three ports the same way in-tree simultaneously.
> Indeed, all of this needs to be tested on sparc64.
Below a diff hopefully addressing all your requests and new tarballs.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/curl/Makefile,v
retrieving revision 1.175
diff -u -p -r1.175 Makefile
--- Makefile 7 Nov 2022 14:37:00 -0000 1.175
+++ Makefile 8 Nov 2022 19:49:57 -0000
@@ -1,7 +1,7 @@
COMMENT= transfer files with FTP, HTTP, HTTPS, etc.
DISTNAME= curl-7.86.0
-REVISION= 0
+REVISION= 1
SHARED_LIBS= curl 26.17 # 12.0
CATEGORIES= net
HOMEPAGE= https://curl.se/
@@ -14,8 +14,9 @@ PERMIT_PACKAGE= Yes
MASTER_SITES= https://curl.se/download/
EXTRACT_SUFX= .tar.xz
-LIB_DEPENDS= www/nghttp2
-WANTLIB= c crypto pthread nghttp2 ssl z
+LIB_DEPENDS= www/nghttp2 www/nghttp3 net/ngtcp2
+WANTLIB= c crypto pthread nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl
+WANTLIB+= ssl z
AUTOCONF_VERSION=2.71
CONFIGURE_STYLE=autoconf
@@ -29,6 +30,7 @@ CONFIGURE_ARGS= --with-openssl \
--without-libpsl \
--without-libssh \
--without-libssh2 \
+ --with-ngtcp2 \
--without-zstd
CONFIGURE_ENV= ac_cv_path_NROFF="/usr/bin/mandoc -Tascii"
No comments:
Post a Comment