fix issue #3683 - fix ICU build on Linux (#3685)

* fix issue #3683 - fix ICU build on Linux

The following changes allow ICU to build on Linux:
- use the ICU tgz distribution rather than the zip file, to avoid CRLF
  line endings on Linux
- don't use MSYS on Linux
- fix runConfigureICU options for Linux
- fix CFLAGS, CXXFLAGS, and LDFLAGS for Linux
- don't rename the resulting libraries on Linux

* [icu] Enable VCPKG_CXX_FLAGS

* [icu] Formatting

2 files changed, 96 insertions, 58 deletions

diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL
index 9d8320762..1fc3d39cc 100644
--- a/ports/icu/CONTROL
+++ b/ports/icu/CONTROL
@@ -1,3 +1,3 @@
 Source: icu

-Version: 61.1-1

+Version: 61.1-2

 Description: Mature and widely used Unicode and localization library.

diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
index afacc076c..ee558d886 100644
--- a/ports/icu/portfile.cmake
+++ b/ports/icu/portfile.cmake
@@ -20,31 +20,19 @@ set(ICU_VERSION_MAJOR 61)
 

 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/icu-${VERSION}/icu)

 vcpkg_download_distfile(

-	ARCHIVE

-    URLS "http://download.icu-project.org/files/icu4c/${VERSION}/icu4c-${VERSION2}-src.zip"

-    FILENAME "icu4c-${VERSION2}-src.zip"

-    SHA512 60fed25976b8c2fe2df0b0ab745ded24da237711ec8c1e1dbdfe6eaf2014fb6b3a4bcaa488174cf770737a1c159a2d3f48a86a139cbb277163f064e607b8928f

-	)

+    ARCHIVE

+    URLS "http://download.icu-project.org/files/icu4c/${VERSION}/icu4c-${VERSION2}-src.tgz"

+    FILENAME "icu4c-${VERSION2}-src.tgz"

+    SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94

+)

 vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/icu-${VERSION})

 

 vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}

     PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-escapestr-tool.patch)

 

-# Acquire tools

-vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15)

+set(CONFIGURE_OPTIONS "--disable-samples --disable-tests")

 

-# Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe".

-string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}")

-string(REPLACE ";$ENV{SystemRoot}\\System32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "${NEWPATH}")

-set(ENV{PATH} "${NEWPATH}")

-set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)

-

-set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.15)

-file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source)

-

-set(CONFIGURE_OPTIONS "--host=i686-pc-mingw32 --disable-samples --disable-tests")

-

-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

     set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --disable-static --enable-shared")

 else()

     set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --enable-static --disable-shared")

@@ -53,39 +41,87 @@ endif()
 set(CONFIGURE_OPTIONS_RELASE "--disable-debug --enable-release --prefix=${CURRENT_PACKAGES_DIR}")

 set(CONFIGURE_OPTIONS_DEBUG  "--enable-debug --disable-release --prefix=${CURRENT_PACKAGES_DIR}/debug")

 

-if(VCPKG_CRT_LINKAGE STREQUAL static)

-    set(ICU_RUNTIME "-MT")

+if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

+

+    set(BASH bash)

+

+    # Configure release

+    message(STATUS "Configuring ${TARGET_TRIPLET}-rel")

+    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)

+    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)

+    set(ENV{CFLAGS} "-O2 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}")

+    set(ENV{CXXFLAGS} "-O2 ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}")

+    vcpkg_execute_required_process(

+        COMMAND ${BASH} --noprofile --norc -c

+            "${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELASE}"

+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"

+        LOGNAME "configure-${TARGET_TRIPLET}-rel")

+    message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")

+

+    # Configure debug

+    message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")

+    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)

+    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)

+    set(ENV{CFLAGS} "-O0 -g ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}")

+    set(ENV{CXXFLAGS} "-O0 -g ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG}")

+    vcpkg_execute_required_process(

+        COMMAND ${BASH} --noprofile --norc -c

+            "${SOURCE_PATH}/source/runConfigureICU Linux ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}"

+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"

+        LOGNAME "configure-${TARGET_TRIPLET}-dbg")

+    message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")

+

 else()

-    set(ICU_RUNTIME "-MD")

-endif()

 

-# Configure release

-message(STATUS "Configuring ${TARGET_TRIPLET}-rel")

-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)

-file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)

-set(ENV{CFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi")

-set(ENV{CXXFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi")

-set(ENV{LDFLAGS} "-DEBUG -INCREMENTAL:NO -OPT:REF -OPT:ICF")

-vcpkg_execute_required_process(

-    COMMAND ${BASH} --noprofile --norc -c 

-        "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELASE}"

-    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"

-    LOGNAME "configure-${TARGET_TRIPLET}-rel")

-message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")

-

-# Configure debug

-message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")

-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)

-file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)

-set(ENV{CFLAGS} "${ICU_RUNTIME}d -Od -Zi -RTC1")

-set(ENV{CXXFLAGS} "${ICU_RUNTIME}d -Od -Zi -RTC1")

-set(ENV{LDFLAGS} "-DEBUG")

-vcpkg_execute_required_process(

-    COMMAND ${BASH} --noprofile --norc -c 

-        "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}"

-    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"

-    LOGNAME "configure-${TARGET_TRIPLET}-dbg")

-message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")

+    set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --host=i686-pc-mingw32")

+

+    # Acquire tools

+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15)

+

+    # Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe".

+    string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}")

+    string(REPLACE ";$ENV{SystemRoot}\\System32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "${NEWPATH}")

+    set(ENV{PATH} "${NEWPATH}")

+    set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)

+

+    set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.15)

+    file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source)

+

+    if(VCPKG_CRT_LINKAGE STREQUAL static)

+        set(ICU_RUNTIME "-MT")

+    else()

+        set(ICU_RUNTIME "-MD")

+    endif()

+

+    # Configure release

+    message(STATUS "Configuring ${TARGET_TRIPLET}-rel")

+    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)

+    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)

+    set(ENV{CFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}")

+    set(ENV{CXXFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}")

+    set(ENV{LDFLAGS} "-DEBUG -INCREMENTAL:NO -OPT:REF -OPT:ICF")

+    vcpkg_execute_required_process(

+        COMMAND ${BASH} --noprofile --norc -c

+            "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_RELASE}"

+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"

+        LOGNAME "configure-${TARGET_TRIPLET}-rel")

+    message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")

+

+    # Configure debug

+    message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")

+    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)

+    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)

+    set(ENV{CFLAGS} "${ICU_RUNTIME}d -Od -Zi -RTC1 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}")

+    set(ENV{CXXFLAGS} "${ICU_RUNTIME}d -Od -Zi -RTC1 ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG}")

+    set(ENV{LDFLAGS} "-DEBUG")

+    vcpkg_execute_required_process(

+        COMMAND ${BASH} --noprofile --norc -c

+            "${SOURCE_PATH}/source/runConfigureICU MSYS/MSVC ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEBUG}"

+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"

+        LOGNAME "configure-${TARGET_TRIPLET}-dbg")

+    message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")

+

+endif()

 

 unset(ENV{CFLAGS})

 unset(ENV{CXXFLAGS})

@@ -123,19 +159,21 @@ file(GLOB TEST_LIBS
     ${CURRENT_PACKAGES_DIR}/debug/lib/*test*)

 file(REMOVE ${TEST_LIBS})

 

-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

     # copy icu dlls from lib to bin

     file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/icu*${ICU_VERSION_MAJOR}.dll)

     file(GLOB DEBUG_DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/icu*d${ICU_VERSION_MAJOR}.dll)

     file(COPY ${RELEASE_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)

     file(COPY ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)

 else()

-    # rename static libraries to match import libs

-    # see https://gitlab.kitware.com/cmake/cmake/issues/16617

-    foreach(MODULE dt in io tu uc)

-        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/sicu${MODULE}.lib ${CURRENT_PACKAGES_DIR}/lib/icu${MODULE}.lib)

-        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sicu${MODULE}d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/icu${MODULE}d.lib)

-    endforeach()

+    if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

+        # rename static libraries to match import libs

+        # see https://gitlab.kitware.com/cmake/cmake/issues/16617

+        foreach(MODULE dt in io tu uc)

+            file(RENAME ${CURRENT_PACKAGES_DIR}/lib/sicu${MODULE}.lib ${CURRENT_PACKAGES_DIR}/lib/icu${MODULE}.lib)

+            file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sicu${MODULE}d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/icu${MODULE}d.lib)

+        endforeach()

+    endif()

 

     # force U_STATIC_IMPLEMENTATION macro

     foreach(HEADER utypes.h utf_old.h platform.h)