2024-01-23 02:56:30 +08:00
|
|
|
build/Jamfile.v2 | 44 +++++++++++++-------------------------------
|
|
|
|
|
1 file changed, 13 insertions(+), 31 deletions(-)
|
|
|
|
|
|
2022-08-26 01:46:01 +08:00
|
|
|
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
|
2024-01-23 02:56:30 +08:00
|
|
|
index f1e2d05..f946a9b 100644
|
2020-07-01 06:00:31 +08:00
|
|
|
--- a/build/Jamfile.v2
|
|
|
|
|
+++ b/build/Jamfile.v2
|
2024-01-23 02:56:30 +08:00
|
|
|
@@ -22,6 +22,7 @@ project /boost/locale
|
2022-08-26 01:46:01 +08:00
|
|
|
# Features
|
|
|
|
|
|
|
|
|
|
feature.feature boost.locale.iconv : on off : optional propagated ;
|
|
|
|
|
+feature.feature boost.locale.force-found-iconv : 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.std : on off : optional propagated ;
|
2024-01-23 02:56:30 +08:00
|
|
|
@@ -132,13 +133,7 @@ if $(ICU_ICUUC_NAME)
|
2022-12-30 02:31:05 +08:00
|
|
|
}
|
|
|
|
|
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 ;
|
2024-01-23 02:56:30 +08:00
|
|
|
+ alias icuuc : /user-config//icuuc ;
|
2022-12-30 02:31:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if $(ICU_ICUDT_NAME)
|
2024-01-23 02:56:30 +08:00
|
|
|
@@ -148,13 +143,7 @@ if $(ICU_ICUDT_NAME)
|
2022-12-30 02:31:05 +08:00
|
|
|
}
|
|
|
|
|
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 ;
|
2024-01-23 02:56:30 +08:00
|
|
|
+ alias icudt : /user-config//icudt ;
|
2022-12-30 02:31:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if $(ICU_ICUIN_NAME)
|
2024-01-23 02:56:30 +08:00
|
|
|
@@ -164,27 +153,16 @@ if $(ICU_ICUIN_NAME)
|
2022-12-30 02:31:05 +08:00
|
|
|
}
|
|
|
|
|
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 ;
|
2024-01-23 02:56:30 +08:00
|
|
|
+ alias icuin : /user-config//icuin ;
|
2022-12-30 02:31:05 +08:00
|
|
|
}
|
|
|
|
|
|
2024-01-23 02:56:30 +08:00
|
|
|
+explicit icuuc icuin icudt ;
|
|
|
|
|
+
|
2022-12-30 02:31:05 +08:00
|
|
|
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
|
|
|
|
|
;
|
2024-01-23 02:56:30 +08:00
|
|
|
@@ -213,6 +191,10 @@ rule configure-full ( properties * : flags-only )
|
|
|
|
|
}
|
2020-07-01 06:00:31 +08:00
|
|
|
|
2022-08-26 01:46:01 +08:00
|
|
|
local found-iconv ;
|
2024-01-23 02:56:30 +08:00
|
|
|
+ if <boost.locale.force-found-iconv>on in $(properties)
|
|
|
|
|
+ {
|
|
|
|
|
+ found-iconv = true ;
|
|
|
|
|
+ }
|
2022-08-26 01:46:01 +08:00
|
|
|
|
2024-01-23 02:56:30 +08:00
|
|
|
if ! <boost.locale.iconv>off in $(properties)
|
|
|
|
|
{
|
