Skip to content

Commit

Permalink
[szip] add definitions for the try_run call for iOS (#26329)
Browse files Browse the repository at this point in the history
  • Loading branch information
russelltg authored Aug 15, 2022
1 parent 69e4d02 commit 5f83f03
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
12 changes: 12 additions & 0 deletions ports/szip/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion ports/szip/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -6974,7 +6974,7 @@
},
"szip": {
"baseline": "2.1.1",
"port-version": 8
"port-version": 9
},
"tabulate": {
"baseline": "2019-01-06",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/szip.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f07c4350652c50e80bc78edb3db20a1c748d99ec",
"version": "2.1.1",
"port-version": 9
},
{
"git-tree": "0c8569ffc46401d06cff22755c0b95953ce5e828",
"version": "2.1.1",
Expand Down

0 comments on commit 5f83f03

Please sign in to comment.