From 88f0e6a94b785f387bc714772d0e8878a2b6059a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 7 Apr 2021 03:12:53 +0800 Subject: [vcpkg baseline][gdal] Fix configure error on OSX (#17083) * [gdal] Fix configure error on OSX * update version record * Revert changes * add touch command * update version record --- ports/gdal/portfile.cmake | 7 +++++++ ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 2f2cae4bb..5b138f8a1 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -176,6 +176,13 @@ if (VCPKG_TARGET_IS_WINDOWS) endif() else() + # See https://github.com/microsoft/vcpkg/issues/16990 + vcpkg_execute_required_process( + COMMAND touch config.rpath + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME touch-${TARGET_TRIPLET} + ) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(BUILD_DYNAMIC yes) set(BUILD_STATIC no) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index f04c03562..b485a2202 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-string": "3.1.3", - "port-version": 3, + "port-version": 4, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.", "homepage": "hhttps://gdal.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index eefd125a7..c8ec96e3c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2146,7 +2146,7 @@ }, "gdal": { "baseline": "3.1.3", - "port-version": 3 + "port-version": 4 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index ec66103c0..f53bc429f 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b503a5dd67c0251115346ebfc05551bc8f36c06f", + "version-string": "3.1.3", + "port-version": 4 + }, { "git-tree": "548d5f5f1ad969bf88d86c17de3ee40ebb096a2f", "version-string": "3.1.3", -- cgit v1.2.3