[szip] Fix build on android (microsoft#32914)

* [szip] Fix build on android * update version database * fix ci baseline * fix ci.baseline.txt
SokaDance · Aug 4, 2023 · 64d69a7 · 64d69a7
1 parent 3e7978b
commit 64d69a7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/ports/szip/portfile.cmake b/ports/szip/portfile.cmake
@@ -14,14 +14,16 @@ vcpkg_extract_source_archive(
         mingw-lib-names.patch
 )
 
-if (VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_OSX)
+if (VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_OSX)
     # when cross-compiling, try_run will not work.
     # LFS "large file support" is keyed on 
     # 1) 64-bit off_t (https://developer.apple.com/library/archive/documentation/Darwin/Conceptual/64bitPorting/transition/transition.html table 2-1)
     # 2) stat works properly, which is true
     set(extra_opts 
         -DTEST_LFS_WORKS_RUN=TRUE
         -DTEST_LFS_WORKS_RUN__TRYRUN_OUTPUT=""
+        -DHAVE_DEFAULT_SOURCE_RUN=0
+        -DHAVE_DEFAULT_SOURCE_RUN__TRYRUN_OUTPUT=""
     )
 endif()
 

diff --git a/ports/szip/vcpkg.json b/ports/szip/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "szip",
   "version": "2.1.1",
-  "port-version": 11,
+  "port-version": 12,
   "description": "Szip compression software, providing lossless compression of scientific data",
   "homepage": "https://support.hdfgroup.org/ftp/lib-external/szip",
   "license": null,

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -484,6 +484,9 @@ gz-tools2:x64-android=fail
 gz-tools2:arm64-android=fail
 halide:x64-windows-static=fail
 hdf5:arm64-windows=fail
+hdf5:arm-neon-android=fail
+hdf5:arm64-android=fail
+hdf5:x64-android=fail
 hexl:x64-android=fail
 highs:arm-neon-android=fail
 highs:arm64-android=fail
@@ -1274,9 +1277,6 @@ symengine:x64-windows-static-md=fail
 systemc:arm64-windows=fail
 systemc:arm-uwp=fail
 systemc:x64-uwp=fail
-szip:arm-neon-android=fail
-szip:arm64-android=fail
-szip:x64-android=fail
 tcl:arm-neon-android=fail
 tcl:arm-uwp=fail
 tcl:arm64-android=fail

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7962,7 +7962,7 @@
     },
     "szip": {
       "baseline": "2.1.1",
-      "port-version": 11
+      "port-version": 12
     },
     "tabulate": {
       "baseline": "1.5",

diff --git a/versions/s-/szip.json b/versions/s-/szip.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bc7c8053e3d7b1926f2a1771e122d151282ecd8d",
+      "version": "2.1.1",
+      "port-version": 12
+    },
     {
       "git-tree": "d70141a3b02fbaec47b0aae75b6abdee3502a0b7",
       "version": "2.1.1",