e05cfd6454
Viktor Szakats
2026-03-17
Subject
build: drop `openssl` module dependency for BoringSSL from `libcurl.pc`
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
CMakeLists.txt+1 -1
| @@ -2167,7 +2167,7 @@ if(NOT CURL_DISABLE_INSTALL) | |
| if(NOT _libs AND NOT _libdirs) | |
| message(WARNING "Bad lib in library list: ${_lib}") | |
| endif() | |
| - | if(_lib STREQUAL OpenSSL::SSL) |
| + | if(_lib STREQUAL OpenSSL::SSL AND NOT HAVE_BORINGSSL) # BoringSSL does not provide openssl.pc |
| set(_modules "openssl") | |
| elseif(_lib STREQUAL ZLIB::ZLIB) | |
| set(_modules "zlib") | |
configure.ac+5 -4
| @@ -3315,7 +3315,7 @@ if test "$USE_NGTCP2" = "1" && test "$OPENSSL_ENABLED" = "1" && test "$HAVE_LIBR | |
| fi | |
| if test "$USE_NGTCP2" = "1" && test "$OPENSSL_ENABLED" = "1" && test "$HAVE_LIBRESSL" != "1" && | |
| - | test "$OPENSSL_IS_BORINGSSL" != "1" && test "$OPENSSL_QUIC_API2" != "1"; then |
| + | test "$OPENSSL_IS_AWSLC" != "1" && test "$OPENSSL_IS_BORINGSSL" != "1" && test "$OPENSSL_QUIC_API2" != "1"; then |
| dnl backup the pre-ngtcp2_crypto_quictls variables | |
| CLEANLDFLAGS="$LDFLAGS" | |
| @@ -3373,8 +3373,8 @@ if test "$USE_NGTCP2" = "1" && test "$OPENSSL_ENABLED" = "1" && test "$HAVE_LIBR | |
| fi | |
| fi | |
| - | if test "$USE_NGTCP2" = "1" && test "$OPENSSL_ENABLED" = "1" && test "$OPENSSL_IS_BORINGSSL" != "1" && |
| - | test "$OPENSSL_QUIC_API2" = "1"; then |
| + | if test "$USE_NGTCP2" = "1" && test "$OPENSSL_ENABLED" = "1" && |
| + | test "$OPENSSL_IS_AWSLC" != "1" && test "$OPENSSL_IS_BORINGSSL" != "1" && test "$OPENSSL_QUIC_API2" = "1"; then |
| dnl backup the pre-ngtcp2_crypto_ossl variables | |
| CLEANLDFLAGS="$LDFLAGS" | |
| @@ -3433,7 +3433,8 @@ if test "$USE_NGTCP2" = "1" && test "$OPENSSL_ENABLED" = "1" && test "$OPENSSL_I | |
| fi | |
| fi | |
| - | if test "$USE_NGTCP2" = "1" && test "$OPENSSL_ENABLED" = "1" && test "$OPENSSL_IS_BORINGSSL" = "1"; then |
| + | if test "$USE_NGTCP2" = "1" && test "$OPENSSL_ENABLED" = "1" && |
| + | (test "$OPENSSL_IS_AWSLC" = "1" || test "$OPENSSL_IS_BORINGSSL" = "1"); then |
| dnl backup the pre-ngtcp2_crypto_boringssl variables | |
| CLEANLDFLAGS="$LDFLAGS" | |
m4/curl-openssl.m4+4 -2
| @@ -260,7 +260,7 @@ if test "x$OPT_OPENSSL" != "xno"; then | |
| ],[ | |
| AC_MSG_RESULT([yes]) | |
| ssl_msg="AWS-LC" | |
| - | OPENSSL_IS_BORINGSSL=1 |
| + | OPENSSL_IS_AWSLC=1 |
| ],[ | |
| AC_MSG_RESULT([no]) | |
| ]) | |
| @@ -325,7 +325,9 @@ if test "x$OPT_OPENSSL" != "xno"; then | |
| fi | |
| fi | |
| check_for_ca_bundle=1 | |
| - | LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE openssl" |
| + | if test "$OPENSSL_IS_BORINGSSL" != "1"; then dnl BoringSSL does not provide openssl.pc |
| + | LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE openssl" |
| + | fi |
| fi | |
| test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg" | |