mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 10:48:06 +08:00
63 lines
1.9 KiB
Diff
63 lines
1.9 KiB
Diff
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
|
|
index f1321db..b0e9283 100644
|
|
--- a/build/Jamfile.v2
|
|
+++ b/build/Jamfile.v2
|
|
@@ -22,6 +21,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 ;
|
|
@@ -204,6 +204,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)
|
|
@@ -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)
|
|
;
|