7bde6cb9fc
Viktor Szakats
2026-05-17
Subject
build: omit zlib pkg-config reference for Android
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
.github/workflows/non-native.yml+6 -0
| @@ -297,6 +297,12 @@ jobs: | |
| if: ${{ !cancelled() }} | |
| run: cat bld/config.log bld/CMakeFiles/CMake*.yaml 2>/dev/null || true | |
| + | - name: 'dump config files' |
| + | run: | |
| + | for f in libcurl.pc curl-config; do |
| + | echo "::group::${f}"; grep -v '^#' bld/"${f}" || true; echo '::endgroup::' |
| + | done |
| + | |
| - name: 'curl_config.h' | |
| run: | | |
| echo '::group::raw'; cat bld/lib/curl_config.h || true; echo '::endgroup::' | |
CMakeLists.txt+1 -1
| @@ -2177,7 +2177,7 @@ if(NOT CURL_DISABLE_INSTALL) | |
| endif() | |
| if(_lib STREQUAL OpenSSL::SSL AND NOT HAVE_BORINGSSL) # BoringSSL does not provide openssl.pc | |
| set(_modules "openssl") | |
| - | elseif(_lib STREQUAL ZLIB::ZLIB) |
| + | elseif(_lib STREQUAL ZLIB::ZLIB AND NOT ANDROID) # Android does not provide zlib.pc |
| set(_modules "zlib") | |
| else() | |
| get_target_property(_modules "${_lib}" INTERFACE_LIBCURL_PC_MODULES) | |
acinclude.m4+7 -9
| @@ -1441,15 +1441,13 @@ AC_DEFUN([CURL_PREPARE_BUILDINFO], [ | |
| *-*-*bsd*) | |
| curl_pflags="${curl_pflags} BSD";; | |
| esac | |
| - | case $host in |
| - | *-*-android*) |
| - | curl_pflags="${curl_pflags} ANDROID" |
| - | ANDROID_PLATFORM_LEVEL=`echo "$host_os" | $SED -ne 's/.*android\(@<:@0-9@:>@*\).*/\1/p'` |
| - | if test -n "${ANDROID_PLATFORM_LEVEL}"; then |
| - | curl_pflags="${curl_pflags}-${ANDROID_PLATFORM_LEVEL}" |
| - | fi |
| - | ;; |
| - | esac |
| + | if test "$curl_cv_android" = "yes"; then |
| + | curl_pflags="${curl_pflags} ANDROID" |
| + | ANDROID_PLATFORM_LEVEL=`echo "$host_os" | $SED -ne 's/.*android\(@<:@0-9@:>@*\).*/\1/p'` |
| + | if test -n "${ANDROID_PLATFORM_LEVEL}"; then |
| + | curl_pflags="${curl_pflags}-${ANDROID_PLATFORM_LEVEL}" |
| + | fi |
| + | fi |
| if test "$curl_cv_native_windows" = "yes"; then | |
| curl_pflags="${curl_pflags} WIN32" | |
| fi | |
configure.ac+6 -1
| @@ -694,8 +694,10 @@ dnl ********************************************************************** | |
| CURL_CHECK_WIN32_CRYPTO | |
| + | curl_cv_android='no' |
| curl_cv_apple='no' | |
| case $host in | |
| + | *-*-android*) curl_cv_android='yes';; |
| *-apple-*) curl_cv_apple='yes';; | |
| esac | |
| @@ -1512,7 +1514,10 @@ else | |
| dnl replace 'HAVE_LIBZ' in the automake makefile.ams | |
| AMFIXLIB="1" | |
| AC_MSG_NOTICE([found both libz and libz.h header]) | |
| - | LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE zlib" |
| + | dnl Android does not provide zlib.pc |
| + | if test "$curl_cv_android" = "no"; then |
| + | LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE zlib" |
| + | fi |
| curl_zlib_msg="enabled" | |
| fi | |
| fi | |