[zlib] Disable version script on OHOS (#51895) (#52048)

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
This commit is contained in:
Jörg Bornemann 2026-06-03 01:05:32 +02:00 committed by GitHub
parent df5e710d85
commit 1defe6684f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,19 @@
diff --git i/CMakeLists.txt w/CMakeLists.txt
index e103c40..1330c0d 100644
--- i/CMakeLists.txt
+++ w/CMakeLists.txt
@@ -187,6 +187,7 @@ if(ZLIB_BUILD_SHARED)
if(UNIX
AND NOT APPLE
AND NOT (CMAKE_SYSTEM_NAME STREQUAL AIX)
+ AND NOT (CMAKE_SYSTEM_NAME STREQUAL OHOS)
AND NOT (CMAKE_SYSTEM_NAME STREQUAL SunOS))
# On unix-like platforms the library is almost always called libz
set_target_properties(
@@ -197,5 +198,6 @@ if(ZLIB_BUILD_SHARED)
UNIX
AND NOT APPLE
AND NOT (CMAKE_SYSTEM_NAME STREQUAL AIX)
+ AND NOT (CMAKE_SYSTEM_NAME STREQUAL OHOS)
AND NOT (CMAKE_SYSTEM_NAME STREQUAL SunOS))
endif(ZLIB_BUILD_SHARED)

View File

@ -5,6 +5,8 @@ vcpkg_from_github(
REF v${VERSION}
SHA512 16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4
HEAD_REF master
PATCHES
0001-no-version-script-on-ohos.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZLIB_BUILD_SHARED)

View File

@ -1,6 +1,7 @@
{
"name": "zlib",
"version": "1.3.2",
"port-version": 1,
"description": "A compression library",
"homepage": "https://www.zlib.net/",
"license": "Zlib",

View File

@ -11238,7 +11238,7 @@
},
"zlib": {
"baseline": "1.3.2",
"port-version": 0
"port-version": 1
},
"zlib-ng": {
"baseline": "2.3.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f49b05c666425471a7f6dc8b6156e9b3675a3c90",
"version": "1.3.2",
"port-version": 1
},
{
"git-tree": "e2a9ce8cf8f5d07e489e14c256eefdd58cd535c1",
"version": "1.3.2",