From 5f83f03a1c7578e6ae04987916b34e018fb63964 Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Mon, 15 Aug 2022 14:35:06 -0500 Subject: [PATCH] [szip] add definitions for the try_run call for iOS (#26329) --- ports/szip/portfile.cmake | 12 ++++++++++++ ports/szip/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/szip.json | 5 +++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ports/szip/portfile.cmake b/ports/szip/portfile.cmake index 1f5a9fb2f6d45e..1072e9881280df 100644 --- a/ports/szip/portfile.cmake +++ b/ports/szip/portfile.cmake @@ -14,11 +14,23 @@ vcpkg_extract_source_archive_ex( mingw-lib-names.patch ) +if (VCPKG_TARGET_IS_IOS) + # 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="" + ) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSZIP_INSTALL_DATA_DIR=share/szip/data -DSZIP_INSTALL_CMAKE_DIR=share/szip + ${extra_opts} ) vcpkg_cmake_install() diff --git a/ports/szip/vcpkg.json b/ports/szip/vcpkg.json index a0e93f315505fd..3144709c2722a3 100644 --- a/ports/szip/vcpkg.json +++ b/ports/szip/vcpkg.json @@ -1,7 +1,7 @@ { "name": "szip", "version": "2.1.1", - "port-version": 8, + "port-version": 9, "description": "Szip compression software, providing lossless compression of scientific data", "homepage": "https://support.hdfgroup.org/ftp/lib-external/szip", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index fa4ad6e78848a5..116ed08db507b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6974,7 +6974,7 @@ }, "szip": { "baseline": "2.1.1", - "port-version": 8 + "port-version": 9 }, "tabulate": { "baseline": "2019-01-06", diff --git a/versions/s-/szip.json b/versions/s-/szip.json index de4087f88f0509..3cd779910ccc06 100644 --- a/versions/s-/szip.json +++ b/versions/s-/szip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f07c4350652c50e80bc78edb3db20a1c748d99ec", + "version": "2.1.1", + "port-version": 9 + }, { "git-tree": "0c8569ffc46401d06cff22755c0b95953ce5e828", "version": "2.1.1",