516a0cd382
Viktor Szakats
2026-02-12
Subject
cmake: add `BORINGSSL_VERSION` configuration variable, test in CI
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
.github/workflows/http3-linux.yml +3 -1CMakeLists.txt +3 -0docs/INSTALL-CMAKE.md +1 -0lib/curl_config-cmake.h.in +3 -0
.github/workflows/http3-linux.yml+3 -1
| @@ -639,14 +639,16 @@ jobs: | |
| run: | | |
| [ -n "${MATRIX_PKG_CONFIG_PATH}" ] && export PKG_CONFIG_PATH="${MATRIX_PKG_CONFIG_PATH}" | |
| if [ "${MATRIX_BUILD}" = 'cmake' ]; then | |
| + | [[ "${MATRIX_GENERATE}" = *'boringssl'* ]] && options=" -DBORINGSSL_VERSION=${BORINGSSL_VERSION}" |
| cmake -B bld -G Ninja \ | |
| -DCMAKE_C_COMPILER_TARGET="$(uname -m)-pc-linux-gnu" -DBUILD_STATIC_LIBS=ON \ | |
| -DCURL_WERROR=ON -DENABLE_DEBUG=ON \ | |
| -DCURL_USE_LIBUV=ON \ | |
| -DTEST_NGHTTPX=/home/runner/nghttp2/build/bin/nghttpx \ | |
| -DHTTPD_NGHTTPX=/home/runner/nghttp2/build/bin/nghttpx \ | |
| - | ${MATRIX_GENERATE} |
| + | ${MATRIX_GENERATE} ${options} |
| else | |
| + | [[ "${MATRIX_CONFIGURE}" = *'boringssl'* ]] && export CPPFLAGS="-DCURL_BORINGSSL_VERSION=\\\"${BORINGSSL_VERSION}\\\"" |
| mkdir bld && cd bld && ../configure --enable-warnings --enable-werror --enable-debug --disable-static \ | |
| --disable-dependency-tracking --enable-option-checking=fatal \ | |
| --with-libuv \ | |
CMakeLists.txt+3 -0
| @@ -821,6 +821,9 @@ if(CURL_USE_OPENSSL) | |
| endif() | |
| if(HAVE_BORINGSSL) | |
| + | if(BORINGSSL_VERSION) |
| + | set(CURL_BORINGSSL_VERSION "\"${BORINGSSL_VERSION}\"") |
| + | endif() |
| set(_openssl "BoringSSL") | |
| elseif(HAVE_AWSLC) | |
| set(_openssl "AWS-LC") | |
docs/INSTALL-CMAKE.md+1 -0
| @@ -406,6 +406,7 @@ Details via CMake | |
| - `AMISSL_INCLUDE_DIR`: Absolute path to AmiSSL include directory. | |
| - `AMISSL_STUBS_LIBRARY`: Absolute path to `amisslstubs` library. | |
| - `AMISSL_AUTO_LIBRARY`: Absolute path to `amisslauto` library. | |
| + | - `BORINGSSL_VERSION`: Set BoringSSL version for `curl -V`/`curl --version` output. |
| - `BROTLI_INCLUDE_DIR`: Absolute path to brotli include directory. | |
| - `BROTLICOMMON_LIBRARY`: Absolute path to `brotlicommon` library. | |
| - `BROTLIDEC_LIBRARY`: Absolute path to `brotlidec` library. | |
lib/curl_config-cmake.h.in+3 -0
| @@ -327,6 +327,9 @@ | |
| /* MIT Kerberos version */ | |
| #cmakedefine CURL_KRB5_VERSION ${CURL_KRB5_VERSION} | |
| + | /* BoringSSL version */ |
| + | #cmakedefine CURL_BORINGSSL_VERSION ${CURL_BORINGSSL_VERSION} |
| + | |
| /* Define to 1 if you have the <ifaddrs.h> header file. */ | |
| #cmakedefine HAVE_IFADDRS_H 1 | |