diff options
Diffstat (limited to 'net-misc/curl/files/curl-8.7.1-fix-pkgconfig-macros.patch')
| -rw-r--r-- | net-misc/curl/files/curl-8.7.1-fix-pkgconfig-macros.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/net-misc/curl/files/curl-8.7.1-fix-pkgconfig-macros.patch b/net-misc/curl/files/curl-8.7.1-fix-pkgconfig-macros.patch new file mode 100644 index 000000000000..91aed9582521 --- /dev/null +++ b/net-misc/curl/files/curl-8.7.1-fix-pkgconfig-macros.patch @@ -0,0 +1,39 @@ +https://github.com/curl/curl/pull/13202 +From: Matt Jolly <kangie@gentoo.org> +Date: Wed, 27 Mar 2024 22:52:26 +1000 +Subject: [PATCH] m4: fix rustls pkg-config codepath + +The previous pkg-config code would successfully detect rustls +but did not set all appropriate variables and call the right macros to +properly configure cURL. + +Closes: #13200 +--- a/m4/curl-rustls.m4 ++++ b/m4/curl-rustls.m4 +@@ -142,6 +142,10 @@ if test "x$OPT_RUSTLS" != xno; then + LIBS="$SSL_LIBS $LIBS" + USE_RUSTLS="yes" + ssl_msg="rustls" ++ AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled]) ++ AC_SUBST(USE_RUSTLS, [1]) ++ RUSTLS_ENABLED=1 ++ test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes + else + AC_MSG_ERROR([pkg-config: Could not find rustls]) + fi +@@ -174,5 +178,15 @@ if test "x$OPT_RUSTLS" != xno; then + fi + + test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg" ++ ++ if test X"$OPT_RUSTLS" != Xno && ++ test "$RUSTLS_ENABLED" != "1"; then ++ AC_MSG_NOTICE([OPT_RUSTLS: $OPT_RUSTLS]) ++ AC_MSG_NOTICE([RUSTLS_ENABLED: $RUSTLS_ENABLED]) ++ AC_MSG_ERROR([--with-rustls was given but Rustls could not be detected]) ++ fi + fi + ]) ++ ++ ++RUSTLS_ENABLED |