From 2c03e7c4dc0f5997bebd7214fed5ec54a23ad743 Mon Sep 17 00:00:00 2001 From: Bill Price <20214261+Victor-Bergman@users.noreply.github.com> Date: Mon, 20 Apr 2020 20:23:58 -0400 Subject: [PATCH 1/4] Apply patch to build boost-locale with ICU --- .../0001-Fix-boost-ICU-support.patch | 100 ++++++++++++++++++ ports/boost-locale/portfile.cmake | 5 + 2 files changed, 105 insertions(+) create mode 100644 ports/boost-locale/0001-Fix-boost-ICU-support.patch diff --git a/ports/boost-locale/0001-Fix-boost-ICU-support.patch b/ports/boost-locale/0001-Fix-boost-ICU-support.patch new file mode 100644 index 00000000000000..cd02f742e93bfc --- /dev/null +++ b/ports/boost-locale/0001-Fix-boost-ICU-support.patch @@ -0,0 +1,100 @@ +--- + libs/locale/build/Jamfile.v2 | 63 ++++++-------------------------------- + libs/locale/build/has_icu_test.cpp | 4 --- + libs/regex/build/Jamfile.v2 | 47 +++++++--------------------- + 3 files changed, 20 insertions(+), 94 deletions(-) + +diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 +index 578e722..5f25917 100644 +--- a/build/Jamfile.v2 ++++ b/build/Jamfile.v2 +@@ -70,62 +70,17 @@ if $(ICU_LINK) + } + else + { +- searched-lib icuuc : : icuuc +- $(ICU_PATH)/lib +- shared +- shared ; +- +- searched-lib icuuc : : msvc +- debug +- icuucd +- $(ICU_PATH)/lib +- shared +- shared ; +- +- searched-lib icuuc : : this_is_an_invalid_library_name ; +- +- searched-lib icudt : : $(ICU_PATH)/lib +- icudata +- shared +- shared ; +- +- searched-lib icudt : : $(ICU_PATH)/lib +- icudt +- msvc +- shared +- shared ; +- +- searched-lib icudt : : this_is_an_invalid_library_name ; +- +- searched-lib icuin : : $(ICU_PATH)/lib +- icui18n +- shared +- shared ; +- +- searched-lib icuin : : msvc +- debug +- icuind +- $(ICU_PATH)/lib +- shared +- shared ; +- +- searched-lib icuin : : msvc +- release +- icuin +- $(ICU_PATH)/lib +- shared +- shared ; +- +- searched-lib icuin : : this_is_an_invalid_library_name ; +- +- explicit icuuc icudt icuin ; ++ alias icuuc : /user-config//icuuc ; ++ alias icuin : /user-config//icuin ; ++ alias icudt : /user-config//icudt ; ++ ++ explicit icuuc icuin icudt ; + + ICU_OPTS = $(ICU_PATH)/include +- icuuc/shared/shared +- icudt/shared/shared +- icuin/shared/shared +- $(ICU_PATH)/bin +- shared ; ++ icuuc ++ icuin ++ icudt ++ $(ICU_PATH)/bin ; + + + +diff --git a/libs/locale/build/has_icu_test.cpp b/libs/locale/build/has_icu_test.cpp +index 9419b30..ed9be05 100644 +--- a/build/has_icu_test.cpp ++++ b/build/has_icu_test.cpp +@@ -15,10 +15,6 @@ + #include + #include + +-#if defined(_MSC_VER) && !defined(_DLL) +-#error "Mixing ICU with a static runtime doesn't work" +-#endif +- + int main() + { + icu::Locale loc; +-- +2.12.2.windows.2 + diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index 569e0acdf09c15..07c63cc353b544 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -10,6 +10,11 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES 0001-Fix-boost-ICU-support.patch +) + if("icu" IN_LIST FEATURES) set(BOOST_LOCALE_ICU on) else() From 86bd8b26e656d81c7c35f20339cdc660d191df30 Mon Sep 17 00:00:00 2001 From: Bill Price <20214261+Victor-Bergman@users.noreply.github.com> Date: Tue, 21 Apr 2020 10:37:08 -0400 Subject: [PATCH 2/4] Make PR requested changes to boost-locale portfile --- ports/boost-locale/portfile.cmake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index 07c63cc353b544..2d177ed67bc629 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -1,17 +1,11 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale REF boost-1.72.0 SHA512 a32a92b4d393f31ca6ba35ceb3d8802b4764e8aa9c8ff5417f3a0f0c886f473b635d613af743764d244459dccb4e285ac6fa50a9eed8d10183fa9954c131b85d HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES 0001-Fix-boost-ICU-support.patch ) From c1e257b14c7c65a295682966b4543fa2ccb5f13f Mon Sep 17 00:00:00 2001 From: Bill Price <20214261+Victor-Bergman@users.noreply.github.com> Date: Tue, 21 Apr 2020 10:40:18 -0400 Subject: [PATCH 3/4] Change boost-locale version to 1.72.0-1 --- ports/boost-locale/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL index bd20f128336a12..d20c2d0d01342f 100644 --- a/ports/boost-locale/CONTROL +++ b/ports/boost-locale/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-locale -Version: 1.72.0 +Version: 1.72.0-1 Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows) Homepage: https://github.com/boostorg/locale Description: Boost locale module From 89364608928bb1cb5d8524ec37f4e958cf197ea0 Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Mon, 29 Jun 2020 20:24:29 -0700 Subject: [PATCH 4/4] bump the version in CONTROL file --- ports/boost-locale/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL index cb63e046f4ef80..d7c8d7c0fa7097 100644 --- a/ports/boost-locale/CONTROL +++ b/ports/boost-locale/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-locale -Version: 1.73.0 +Version: 1.73.0-1 Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows) Homepage: https://github.com/boostorg/locale Description: Boost locale module