diff options
| author | Adam <adam-bloom@users.noreply.github.com> | 2021-09-03 17:42:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-03 16:42:38 -0700 |
| commit | aed3b48635aad5b0e13a45acfb58c232648e46dd (patch) | |
| tree | 5161bd7d4ee339a779a974cbb4828075871803c5 | |
| parent | 960264885a52c1fb5e954ab30ccc02ccccf366d8 (diff) | |
| download | vcpkg-aed3b48635aad5b0e13a45acfb58c232648e46dd.tar.gz vcpkg-aed3b48635aad5b0e13a45acfb58c232648e46dd.zip | |
[icu] fixes for macOS dynamic lib install (#19441)
* fixes for macOS dynamic lib install
* bump port version
* remove mingw change
* move install outside of conditional
* update portfile hash
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/icu/portfile.cmake | 16 | ||||
| -rw-r--r-- | ports/icu/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/i-/icu.json | 5 |
4 files changed, 12 insertions, 13 deletions
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 8533c384a..bd67c0711 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -116,18 +116,10 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT DEF WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" ) - - # make install - vcpkg_execute_build_process( - COMMAND bash --noprofile --norc -c "make install" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" - LOGNAME "make-install-${RELEASE_TRIPLET}") - message(STATUS "Package ${RELEASE_TRIPLET} done") - -else() - vcpkg_install_make() endif() +vcpkg_install_make() + if(VCPKG_TARGET_IS_MINGW) file(GLOB ICU_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_HOST_EXECUTABLE_SUFFIX} @@ -147,7 +139,9 @@ file(REMOVE_RECURSE file(GLOB TEST_LIBS ${CURRENT_PACKAGES_DIR}/lib/*test* ${CURRENT_PACKAGES_DIR}/debug/lib/*test*) -file(REMOVE ${TEST_LIBS}) +if(TEST_LIBS) + file(REMOVE ${TEST_LIBS}) +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index c4f6e3c4b..4473713fa 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "69.1", - "port-version": 12, + "port-version": 13, "description": "Mature and widely used Unicode and localization library.", "homepage": "http://icu-project.org/apiref/icu4c/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 08cd9a94d..552719363 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2590,7 +2590,7 @@ }, "icu": { "baseline": "69.1", - "port-version": 12 + "port-version": 13 }, "ideviceinstaller": { "baseline": "1.1.2.23-1", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index cf7ef20da..cd747442b 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "d8c36cdfe8059aadefd80b2d5800a5d9f3494cd6", + "version": "69.1", + "port-version": 13 + }, + { "git-tree": "02bcc079d00e16237aa0d1af449d7663581a1525", "version": "69.1", "port-version": 12 |