mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-29 09:19:07 +08:00
8424da584e
* [scripts/boost] modify script to use v1.80.0.beta1 * [boost] generate ports * add versions * [boost-build] remove obsolete patches * update version * [boost-json] remove obsolete patch * [scripts/boost] modify script to use v1.80.0 * [boost] generate ports v1.80.0 * [boost] generate ports v1.80.0 * [boost-locale] update patch * update versions * [scripts/boost] fix script and regenerate Boost ports * update versions * update version Co-authored-by: Yury Bura <yury.bura@sk.com>
116 lines
4.0 KiB
Diff
116 lines
4.0 KiB
Diff
build/Jamfile.v2 | 69 +++++++++++---------------------------------------
|
|
build/has_icu_test.cpp | 4 ---
|
|
2 files changed, 15 insertions(+), 58 deletions(-)
|
|
|
|
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
|
|
index 450ec87..653f592 100644
|
|
--- a/build/Jamfile.v2
|
|
+++ b/build/Jamfile.v2
|
|
@@ -20,6 +20,7 @@ project /boost/locale
|
|
# 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 ;
|
|
@@ -86,62 +87,17 @@ if $(ICU_LINK)
|
|
ICU64_OPTS = <include>$(icu-path)/include <linkflags>$(ICU_LINK) <dll-path>$(icu-path)/bin64 <runtime-link>shared ;
|
|
} else
|
|
{
|
|
- searched-lib icuuc : : <name>icuuc
|
|
- <search>$(icu-path)/lib
|
|
- <link>shared
|
|
- <runtime-link>shared ;
|
|
-
|
|
- searched-lib icuuc : : <toolset>msvc
|
|
- <variant>debug
|
|
- <name>icuucd
|
|
- <search>$(icu-path)/lib
|
|
- <link>shared
|
|
- <runtime-link>shared ;
|
|
-
|
|
- searched-lib icuuc : : <name>this_is_an_invalid_library_name ;
|
|
-
|
|
- searched-lib icudt : : <search>$(icu-path)/lib
|
|
- <name>icudata
|
|
- <link>shared
|
|
- <runtime-link>shared ;
|
|
-
|
|
- searched-lib icudt : : <search>$(icu-path)/lib
|
|
- <name>icudt
|
|
- <toolset>msvc
|
|
- <link>shared
|
|
- <runtime-link>shared ;
|
|
-
|
|
- searched-lib icudt : : <name>this_is_an_invalid_library_name ;
|
|
-
|
|
- searched-lib icuin : : <search>$(icu-path)/lib
|
|
- <name>icui18n
|
|
- <link>shared
|
|
- <runtime-link>shared ;
|
|
-
|
|
- searched-lib icuin : : <toolset>msvc
|
|
- <variant>debug
|
|
- <name>icuind
|
|
- <search>$(icu-path)/lib
|
|
- <link>shared
|
|
- <runtime-link>shared ;
|
|
-
|
|
- searched-lib icuin : : <toolset>msvc
|
|
- <variant>release
|
|
- <name>icuin
|
|
- <search>$(icu-path)/lib
|
|
- <link>shared
|
|
- <runtime-link>shared ;
|
|
-
|
|
- searched-lib icuin : : <name>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 = <include>$(icu-path)/include
|
|
- <library>icuuc/<link>shared/<runtime-link>shared
|
|
- <library>icudt/<link>shared/<runtime-link>shared
|
|
- <library>icuin/<link>shared/<runtime-link>shared
|
|
- <dll-path>$(icu-path)/bin
|
|
- <runtime-link>shared ;
|
|
+ <library>icuuc
|
|
+ <library>icuin
|
|
+ <library>icudt
|
|
+ <dll-path>$(icu-path)/bin ;
|
|
|
|
|
|
|
|
@@ -221,6 +177,11 @@ rule configure-full ( properties * : flags-only )
|
|
|
|
local found-iconv ;
|
|
|
|
+ if <boost.locale.force-found-iconv>on in $(properties)
|
|
+ {
|
|
+ found-iconv = true ;
|
|
+ }
|
|
+
|
|
# The system Iconv on Solaris may have bugs, while the GNU Iconv is fine.
|
|
# So enable by default only if not on Solaris.
|
|
if <boost.locale.iconv>on in $(properties)
|
|
diff --git a/build/has_icu_test.cpp b/build/has_icu_test.cpp
|
|
index 344c8ea..f200bce 100644
|
|
--- a/build/has_icu_test.cpp
|
|
+++ b/build/has_icu_test.cpp
|
|
@@ -9,10 +9,6 @@
|
|
#include <unicode/uchar.h>
|
|
#include <unicode/coll.h>
|
|
|
|
-#if defined(_MSC_VER) && !defined(_DLL)
|
|
-#error "Mixing ICU with a static runtime doesn't work"
|
|
-#endif
|
|
-
|
|
int main()
|
|
{
|
|
icu::Locale loc;
|