Skip to content

[icu] fix mac os x64 build on apple arm #16433

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

Closed
autoantwort wants to merge 3 commits into from
Closed

[icu] fix mac os x64 build on apple arm #16433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4823e07
[icu] fix mac os x64 build on apple arm
autoantwort Feb 26, 2021
c5196b6
add version files
autoantwort Feb 26, 2021
8b905a1
clean up baseline about icu
Mar 1, 2021
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
2 changes: 1 addition & 1 deletion ports/icu/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: icu
Version: 67.1
Port-Version: 8
Port-Version: 9
Homepage: http://icu-project.org/apiref/icu4c/
Description: Mature and widely used Unicode and localization library.
Supports: !(arm|uwp)
12 changes: 12 additions & 0 deletions ports/icu/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
"${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELEASE}"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}"
LOGNAME "configure-${RELEASE_TRIPLET}")
if(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
file(READ "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/icudefs.mk" FILE_CONTENTS)
string(REPLACE "CC = clang" "CC = clang -arch x86_64" FILE_CONTENTS ${FILE_CONTENTS})
Copy link
Contributor

@ras0219-msft ras0219-msft Mar 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like -arch x86_64 should be part of the target CFLAGS. We might want to look at using

https://github.com/microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake

to compute the right flags. Otherwise, this PR looks like an acceptable incremental improvement.

string(REPLACE "CXX = clang++" "CXX = clang++ -arch x86_64" FILE_CONTENTS ${FILE_CONTENTS})
file(WRITE "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/icudefs.mk" ${FILE_CONTENTS})
endif()
message(STATUS "Configuring ${RELEASE_TRIPLET} done")
endif()

Expand All @@ -71,6 +77,12 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
"${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}"
LOGNAME "configure-${DEBUG_TRIPLET}")
if(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
file(READ "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/icudefs.mk" FILE_CONTENTS)
string(REPLACE "CC = clang" "CC = clang -arch x86_64" FILE_CONTENTS ${FILE_CONTENTS})
string(REPLACE "CXX = clang++" "CXX = clang++ -arch x86_64" FILE_CONTENTS ${FILE_CONTENTS})
file(WRITE "${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/icudefs.mk" ${FILE_CONTENTS})
endif()
message(STATUS "Configuring ${DEBUG_TRIPLET} done")
endif()

Expand Down
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,6 @@ hiredis:x64-uwp=fail
hpx:x64-windows-static=fail
hpx:x64-linux=fail
libhsplasma:x64-windows-static=fail
icu:arm-uwp=fail
icu:x64-uwp=fail
ideviceinstaller:x64-windows-static-md=fail
idevicerestore:x64-linux=fail
idevicerestore:x64-osx=fail
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 @@ -2450,7 +2450,7 @@
},
"icu": {
"baseline": "67.1",
"port-version": 8
"port-version": 9
},
"ideviceinstaller": {
"baseline": "1.1.2.23-1",
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": "b4fc3c9f90e2b00da9e71d4dfa08fa58ec3edf12",
"version-string": "67.1",
"port-version": 9
},
{
"git-tree": "db2977707d68a8c04e0960b0965722f8e5bfda20",
"version-string": "67.1",
Expand Down