Skip to content

Commit 9944af3

Browse files
committed
update_checkout: update zlib to 1.3.1
This is required to enable building zlib for Android with newer NDKs.
1 parent 6831c24 commit 9944af3

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

utils/build.ps1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,14 +1080,14 @@ function Build-ZLib([Platform]$Platform, $Arch) {
10801080

10811081
Build-CMakeProject `
10821082
-Src $SourceCache\zlib `
1083-
-Bin "$($Arch.BinaryCache)\zlib-1.3" `
1084-
-InstallTo $LibraryRoot\zlib-1.3\usr `
1083+
-Bin "$($Arch.BinaryCache)\zlib-1.3.1" `
1084+
-InstallTo $LibraryRoot\zlib-1.3.1\usr `
10851085
-Arch $Arch `
10861086
-BuildTargets default `
10871087
-Defines @{
10881088
BUILD_SHARED_LIBS = "NO";
1089-
INSTALL_BIN_DIR = "$LibraryRoot\zlib-1.3\usr\bin\$ArchName";
1090-
INSTALL_LIB_DIR = "$LibraryRoot\zlib-1.3\usr\lib\$ArchName";
1089+
INSTALL_BIN_DIR = "$LibraryRoot\zlib-1.3.1\usr\bin\$ArchName";
1090+
INSTALL_LIB_DIR = "$LibraryRoot\zlib-1.3.1\usr\lib\$ArchName";
10911091
}
10921092
}
10931093

@@ -1202,8 +1202,8 @@ function Build-CURL([Platform]$Platform, $Arch) {
12021202
USE_WIN32_IDN = "YES";
12031203
USE_WIN32_LARGE_FILES = "YES";
12041204
USE_WIN32_LDAP = "NO";
1205-
ZLIB_ROOT = "$LibraryRoot\zlib-1.3\usr";
1206-
ZLIB_LIBRARY = "$LibraryRoot\zlib-1.3\usr\lib\$ArchName\zlibstatic.lib";
1205+
ZLIB_ROOT = "$LibraryRoot\zlib-1.3.1\usr";
1206+
ZLIB_LIBRARY = "$LibraryRoot\zlib-1.3.1\usr\lib\$ArchName\zlibstatic.lib";
12071207
}
12081208
}
12091209

@@ -1333,8 +1333,8 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
13331333
LIBXML2_LIBRARY = "$LibraryRoot\libxml2-2.11.5\usr\lib\$ShortArch\libxml2s.lib";
13341334
LIBXML2_INCLUDE_DIR = "$LibraryRoot\libxml2-2.11.5\usr\include\libxml2";
13351335
LIBXML2_DEFINITIONS = "/DLIBXML_STATIC";
1336-
ZLIB_LIBRARY = "$LibraryRoot\zlib-1.3\usr\lib\$ShortArch\zlibstatic.lib";
1337-
ZLIB_INCLUDE_DIR = "$LibraryRoot\zlib-1.3\usr\include";
1336+
ZLIB_LIBRARY = "$LibraryRoot\zlib-1.3.1\usr\lib\$ShortArch\zlibstatic.lib";
1337+
ZLIB_INCLUDE_DIR = "$LibraryRoot\zlib-1.3.1\usr\include";
13381338
dispatch_DIR = "$DispatchBinaryCache\cmake\modules";
13391339
} + $TestingDefines)
13401340
}

utils/update_checkout/update-checkout-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
"curl": "curl-8_4_0",
150150
"icu": "maint/maint-69",
151151
"libxml2": "v2.11.5",
152-
"zlib": "v1.3"
152+
"zlib": "v1.3.1"
153153
}
154154
},
155155
"release/5.10": {

0 commit comments

Comments
 (0)