romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-05 00:46:12 +03:00
Code Issues Projects Releases Packages Wiki Activity

build: omit zlib pkg-config reference for Android

Browse source 
In both autotools and cmake builds, because Android does not offer
a `zlib.pc`.

Also:
- GHA/non-native: dump config files, to verify.

Reported-by: sfan5 on github
Fixes #21647

Closes #21648
This commit is contained in:
Viktor Szakats 2026-05-16 23:38:11 +02:00
parent 44ede0cc5a
commit 7bde6cb9fc
No known key found for this signature in database
4 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
acinclude.m4
View file

@ -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