diff --git a/ports/boost-locale/fix-dependencies.patch b/ports/boost-locale/fix-dependencies.patch index 8f8e9f90a4..de6d4bf707 100644 --- a/ports/boost-locale/fix-dependencies.patch +++ b/ports/boost-locale/fix-dependencies.patch @@ -10,6 +10,69 @@ index f1321db..b0e9283 100644 feature.feature boost.locale.icu : on off : optional propagated ; feature.feature boost.locale.posix : on off : optional propagated ; feature.feature boost.locale.std : on off : optional propagated ; +@@ -133,13 +133,7 @@ if $(ICU_ICUUC_NAME) + } + else + { +- lib icuuc : : shared @path_options ; +- lib icuuc : : msvc debug icuucd shared @path_options ; +- lib icuuc : : intel windows debug icuucd shared @path_options ; +- lib icuuc : : sicuuc static @path_options ; +- lib icuuc : : msvc debug sicuucd static @path_options ; +- lib icuuc : : intel windows debug sicuucd static @path_options ; +- lib icuuc : : this_is_an_invalid_library_name ; ++ alias icuuc : /user-config//icuuc ; + } + + if $(ICU_ICUDT_NAME) +@@ -149,13 +143,7 @@ if $(ICU_ICUDT_NAME) + } + else + { +- lib icudt : : icudata shared @path_options ; +- lib icudt : : icudt msvc shared @path_options ; +- lib icudt : : icudt intel windows shared @path_options ; +- lib icudt : : sicudata static @path_options ; +- lib icudt : : sicudt msvc static @path_options ; +- lib icudt : : sicudt intel windows static @path_options ; +- lib icudt : : this_is_an_invalid_library_name ; ++ alias icudt : /user-config//icudt ; + } + + if $(ICU_ICUIN_NAME) +@@ -165,27 +153,15 @@ if $(ICU_ICUIN_NAME) + } + else + { +- lib icuin : : icui18n shared @path_options ; +- lib icuin : : msvc debug icuind shared @path_options ; +- lib icuin : : msvc icuin shared @path_options ; +- lib icuin : : intel windows debug icuind shared @path_options ; +- lib icuin : : intel windows icuin shared @path_options ; +- lib icuin : : sicui18n static @path_options ; +- lib icuin : : msvc debug sicuind static @path_options ; +- lib icuin : : msvc sicuin static @path_options ; +- lib icuin : : intel windows debug sicuind static @path_options ; +- lib icuin : : intel windows sicuin static @path_options ; +- lib icuin : : this_is_an_invalid_library_name ; ++ alias icuin : /user-config//icuin ; + } ++explicit icuuc icuin icudt ; + + ICU_OPTS = + $(.icu-path)/include +- shared:icuuc/shared +- shared:icudt/shared +- shared:icuin/shared +- static:icuuc +- static:icudt +- static:icuin ++ icuuc ++ icudt ++ icuin + windows,clang:"advapi32.lib" + static:U_STATIC_IMPLEMENTATION=1 + ; @@ -204,6 +204,11 @@ rule configure-full ( properties * : flags-only ) local found-iconv ; @@ -22,41 +85,3 @@ index f1321db..b0e9283 100644 # The system Iconv on Solaris may have bugs, while the GNU Iconv is fine. # So enable by default only if not on Solaris. if on in $(properties) -@@ -384,23 +389,6 @@ rule configure-flags ( properties * ) - - alias build_flags : : : : @configure-flags ; - --local cxx_requirements = [ requires -- cxx11_auto_declarations -- cxx11_decltype -- cxx11_defaulted_functions -- cxx11_defaulted_moves -- cxx11_hdr_functional -- cxx11_hdr_type_traits -- cxx11_noexcept -- cxx11_nullptr -- cxx11_override -- cxx11_range_based_for -- cxx11_rvalue_references -- cxx11_scoped_enums -- cxx11_smart_ptr -- cxx11_static_assert -- ] ; -- - boost-lib locale - : - encoding/codepage.cpp -@@ -417,7 +405,6 @@ boost-lib locale - util/info.cpp - util/locale_data.cpp - : -- $(cxx_requirements) - # Don't link explicitly, not required - BOOST_THREAD_NO_LIB=1 - $(TOP)/src -@@ -426,5 +413,4 @@ boost-lib locale - windows:_SCL_SECURE_NO_WARNINGS - # Meanwhile remove this - @configure -- : : $(cxx_requirements) - ; diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json index 1bcb6b9608..07480b1f41 100644 --- a/ports/boost-locale/vcpkg.json +++ b/ports/boost-locale/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "When changing this file also update and run scripts/boost/generate-ports.ps1", "name": "boost-locale", "version": "1.81.0", + "port-version": 1, "description": "Boost locale module", "homepage": "https://github.com/boostorg/locale", "license": "BSL-1.0", diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 3597f77b56..4d44010fa9 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -24,6 +24,7 @@ else { # Clear this array when moving to a new boost version $portVersions = @{ #e.g. "boost-asio" = 1; + "boost-locale" = 1; } $portData = @{ diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json index d236eb46dd..8c065caaf0 100644 --- a/versions/b-/boost-locale.json +++ b/versions/b-/boost-locale.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2f1a8590c1bf9ab12b880fe05af6854bd6bc6f2", + "version": "1.81.0", + "port-version": 1 + }, { "git-tree": "122ecab6bce2dc1662f24aac1d71f66033feea7a", "version": "1.81.0", diff --git a/versions/baseline.json b/versions/baseline.json index 20db432329..642b0a08f6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -846,7 +846,7 @@ }, "boost-locale": { "baseline": "1.81.0", - "port-version": 0 + "port-version": 1 }, "boost-lockfree": { "baseline": "1.81.0",