mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[boost-locale] fix icu feature (#28504)
This commit is contained in:
Nick
GitHub
parent
2ac8af6d70
commit
39bba54c4d
@ -10,6 +10,69 @@ index f1321db..b0e9283 100644
|
|||||||
feature.feature boost.locale.icu : on off : optional propagated ;
|
feature.feature boost.locale.icu : on off : optional propagated ;
|
||||||
feature.feature boost.locale.posix : on off : optional propagated ;
|
feature.feature boost.locale.posix : on off : optional propagated ;
|
||||||
feature.feature boost.locale.std : on off : optional propagated ;
|
feature.feature boost.locale.std : on off : optional propagated ;
|
||||||
|
@@ -133,13 +133,7 @@ if $(ICU_ICUUC_NAME)
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- lib icuuc : : <runtime-link>shared <conditional>@path_options ;
|
||||||
|
- lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <runtime-link>shared <conditional>@path_options ;
|
||||||
|
- lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>icuucd <runtime-link>shared <conditional>@path_options ;
|
||||||
|
- lib icuuc : : <name>sicuuc <runtime-link>static <conditional>@path_options ;
|
||||||
|
- lib icuuc : : <toolset>msvc <variant>debug <name>sicuucd <runtime-link>static <conditional>@path_options ;
|
||||||
|
- lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>sicuucd <runtime-link>static <conditional>@path_options ;
|
||||||
|
- lib icuuc : : <name>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 : : <name>icudata <runtime-link>shared <conditional>@path_options ;
|
||||||
|
- lib icudt : : <name>icudt <toolset>msvc <runtime-link>shared <conditional>@path_options ;
|
||||||
|
- lib icudt : : <name>icudt <toolset>intel <target-os>windows <runtime-link>shared <conditional>@path_options ;
|
||||||
|
- lib icudt : : <name>sicudata <runtime-link>static <conditional>@path_options ;
|
||||||
|
- lib icudt : : <name>sicudt <toolset>msvc <runtime-link>static <conditional>@path_options ;
|
||||||
|
- lib icudt : : <name>sicudt <toolset>intel <target-os>windows <runtime-link>static <conditional>@path_options ;
|
||||||
|
- lib icudt : : <name>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 : : <name>icui18n <runtime-link>shared <conditional>@path_options ;
|
||||||
|
- lib icuin : : <toolset>msvc <variant>debug <name>icuind <runtime-link>shared <conditional>@path_options ;
|
||||||
|
- lib icuin : : <toolset>msvc <name>icuin <runtime-link>shared <conditional>@path_options ;
|
||||||
|
- lib icuin : : <toolset>intel <target-os>windows <variant>debug <name>icuind <runtime-link>shared <conditional>@path_options ;
|
||||||
|
- lib icuin : : <toolset>intel <target-os>windows <name>icuin <runtime-link>shared <conditional>@path_options ;
|
||||||
|
- lib icuin : : <name>sicui18n <runtime-link>static <conditional>@path_options ;
|
||||||
|
- lib icuin : : <toolset>msvc <variant>debug <name>sicuind <runtime-link>static <conditional>@path_options ;
|
||||||
|
- lib icuin : : <toolset>msvc <name>sicuin <runtime-link>static <conditional>@path_options ;
|
||||||
|
- lib icuin : : <toolset>intel <target-os>windows <variant>debug <name>sicuind <runtime-link>static <conditional>@path_options ;
|
||||||
|
- lib icuin : : <toolset>intel <target-os>windows <name>sicuin <runtime-link>static <conditional>@path_options ;
|
||||||
|
- lib icuin : : <name>this_is_an_invalid_library_name ;
|
||||||
|
+ alias icuin : /user-config//icuin ;
|
||||||
|
}
|
||||||
|
+explicit icuuc icuin icudt ;
|
||||||
|
|
||||||
|
ICU_OPTS =
|
||||||
|
<include>$(.icu-path)/include
|
||||||
|
- <runtime-link>shared:<library>icuuc/<link>shared
|
||||||
|
- <runtime-link>shared:<library>icudt/<link>shared
|
||||||
|
- <runtime-link>shared:<library>icuin/<link>shared
|
||||||
|
- <runtime-link>static:<library>icuuc
|
||||||
|
- <runtime-link>static:<library>icudt
|
||||||
|
- <runtime-link>static:<library>icuin
|
||||||
|
+ <library>icuuc
|
||||||
|
+ <library>icudt
|
||||||
|
+ <library>icuin
|
||||||
|
<target-os>windows,<toolset>clang:<linkflags>"advapi32.lib"
|
||||||
|
<runtime-link>static:<define>U_STATIC_IMPLEMENTATION=1
|
||||||
|
;
|
||||||
@@ -204,6 +204,11 @@ rule configure-full ( properties * : flags-only )
|
@@ -204,6 +204,11 @@ rule configure-full ( properties * : flags-only )
|
||||||
|
|
||||||
local found-iconv ;
|
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.
|
# The system Iconv on Solaris may have bugs, while the GNU Iconv is fine.
|
||||||
# So enable by default only if not on Solaris.
|
# So enable by default only if not on Solaris.
|
||||||
if <boost.locale.iconv>on in $(properties)
|
if <boost.locale.iconv>on in $(properties)
|
||||||
@@ -384,23 +389,6 @@ rule configure-flags ( properties * )
|
|
||||||
|
|
||||||
alias build_flags : : : : <conditional>@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
|
|
||||||
<define>BOOST_THREAD_NO_LIB=1
|
|
||||||
<include>$(TOP)/src
|
|
||||||
@@ -426,5 +413,4 @@ boost-lib locale
|
|
||||||
<target-os>windows:<define>_SCL_SECURE_NO_WARNINGS
|
|
||||||
# Meanwhile remove this
|
|
||||||
<conditional>@configure
|
|
||||||
- : : $(cxx_requirements)
|
|
||||||
;
|
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
"$comment": "When changing this file also update and run scripts/boost/generate-ports.ps1",
|
"$comment": "When changing this file also update and run scripts/boost/generate-ports.ps1",
|
||||||
"name": "boost-locale",
|
"name": "boost-locale",
|
||||||
"version": "1.81.0",
|
"version": "1.81.0",
|
||||||
|
"port-version": 1,
|
||||||
"description": "Boost locale module",
|
"description": "Boost locale module",
|
||||||
"homepage": "https://github.com/boostorg/locale",
|
"homepage": "https://github.com/boostorg/locale",
|
||||||
"license": "BSL-1.0",
|
"license": "BSL-1.0",
|
||||||
|
|||||||
@ -24,6 +24,7 @@ else {
|
|||||||
# Clear this array when moving to a new boost version
|
# Clear this array when moving to a new boost version
|
||||||
$portVersions = @{
|
$portVersions = @{
|
||||||
#e.g. "boost-asio" = 1;
|
#e.g. "boost-asio" = 1;
|
||||||
|
"boost-locale" = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
$portData = @{
|
$portData = @{
|
||||||
|
|||||||
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "e2f1a8590c1bf9ab12b880fe05af6854bd6bc6f2",
|
||||||
|
"version": "1.81.0",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "122ecab6bce2dc1662f24aac1d71f66033feea7a",
|
"git-tree": "122ecab6bce2dc1662f24aac1d71f66033feea7a",
|
||||||
"version": "1.81.0",
|
"version": "1.81.0",
|
||||||
|
|||||||
@ -846,7 +846,7 @@
|
|||||||
},
|
},
|
||||||
"boost-locale": {
|
"boost-locale": {
|
||||||
"baseline": "1.81.0",
|
"baseline": "1.81.0",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"boost-lockfree": {
|
"boost-lockfree": {
|
||||||
"baseline": "1.81.0",
|
"baseline": "1.81.0",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user