<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b944040204a0f97164809ada1205c1071e7d8436">https://github.com/macports/macports-ports/commit/b944040204a0f97164809ada1205c1071e7d8436</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b944040204a0f97164809ada1205c1071e7d8436
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu May 5 07:44:25 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> curl: Move HTTP/2 support back to +http2 variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Revert the preceding effort to enable HTTP/2 unconditionally. While
</span><span style='display:block; white-space:pre;color:#404040;'> HTTP/2 is nice, it uses nghttp2 which requires C++14 which requires
</span><span style='display:block; white-space:pre;color:#404040;'> newer compilers on older systems which can cause a bootstrapping
</span><span style='display:block; white-space:pre;color:#404040;'> headache. So now enable the variant by default only on systems that
</span><span style='display:block; white-space:pre;color:#404040;'> don't need additional compilers to build it.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65056
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65063
</span>---
net/curl/Portfile | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/Portfile b/net/curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 57426345138..ba279cf4dc7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,14 +35,13 @@ checksums ${curl_distfile} \
</span> if {${name} eq ${subport}} {
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
depends_build port:pkgconfig
depends_lib port:brotli \
port:libidn2 \
port:libpsl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:nghttp2 \
</span> port:zlib \
port:zstd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +58,7 @@ if {${name} eq ${subport}} {
</span> --without-librtmp \
--without-libssh2 \
--without-mbedtls \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-nghttp2 \
</span> --without-nss \
--without-ssl \
--without-secure-transport \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,6 @@ if {${name} eq ${subport}} {
</span> --disable-ldaps \
--with-brotli \
--with-libidn2=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-nghttp2=${prefix} \
</span> --with-zlib=${prefix} \
--with-zstd \
ac_cv_prog_AWK=/usr/bin/awk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,6 +186,22 @@ if {${name} eq ${subport}} {
</span> configure.args-replace --without-gssapi --with-gssapi
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant http2 description {Support HTTP/2 with nghttp2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:nghttp2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-nghttp2 --with-nghttp2=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # HTTP/2 support is desirable but nghttp2 requires C++14. Some users
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use a bootstrap MacPorts installation to provide a newer curl for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # a primary MacPorts installation and requiring those users to build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # a C++14 compiler for that is undesirable. Also, newer clangs use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cmake, which uses curl, so it would introduce a dependency cycle.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # So enable this variant by default only on systems that have a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # suitable compiler in Xcode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} ne "darwin" || ${os.major} >= 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +http2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant openldap description {Support performing Lightweight Directory Access Protocol queries with OpenLDAP} {
depends_lib-append path:lib/libldap.dylib:openldap
configure.args-replace --disable-ldap --enable-ldap
</pre><pre style='margin:0'>
</pre>