Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[icu] Fix #30532: trying to set rpath on missing libicutu #30544

Merged
merged 4 commits into from
Apr 12, 2023
Merged

[icu] Fix #30532: trying to set rpath on missing libicutu #30544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac80fda
[icu] Fix #30532: trying to set rpath on missing libicutu
janisozaur Mar 30, 2023
c4a9c21
Merge branch 'master' of https://github.com/microsoft/vcpkg into icu-…
Apr 3, 2023
d9dc6d2
Merge branch 'master' of https://github.com/microsoft/vcpkg into icu-…
Apr 10, 2023
cea8dc8
Merge branch 'master' of https://github.com/microsoft/vcpkg into icu-…
Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ports/icu/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,11 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

message(STATUS "setting rpath prefix for macOS dynamic libraries")

if("tools" IN_LIST FEATURES)
set(LIBICUTU_RPATH "libicutu")
endif()
# add ID_PREFIX to libicudata libicui18n libicuio libicutu libicuuc
foreach(LIB_NAME IN ITEMS libicudata libicui18n libicuio libicutu libicuuc)
foreach(LIB_NAME IN ITEMS libicudata libicui18n libicuio ${LIBICUTU_RPATH} libicuuc)
vcpkg_execute_build_process(
COMMAND "${INSTALL_NAME_TOOL}" -id "${ID_PREFIX}/${LIB_NAME}.${ICU_VERSION_MAJOR}.dylib"
"${LIB_NAME}.${VERSION}.dylib"
Expand Down
2 changes: 1 addition & 1 deletion ports/icu/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "icu",
"version": "72.1",
"port-version": 3,
"port-version": 4,
"description": "Mature and widely used Unicode and localization library.",
"homepage": "https://icu.unicode.org/home",
"license": "ICU",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3142,7 +3142,7 @@
},
"icu": {
"baseline": "72.1",
"port-version": 3
"port-version": 4
},
"ideviceinstaller": {
"baseline": "1.1.2.23",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/icu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1a0b575f86d37844108f940fd5f6a312a68d234c",
"version": "72.1",
"port-version": 4
},
{
"git-tree": "36a3246630c4794b3781e881e5a57db36092deea",
"version": "72.1",
Expand Down