diff -Naur boost-1.61.0.orig/libs/locale/build/has_icu_test.cpp boost-1.61.0.patched/libs/locale/build/has_icu_test.cpp --- boost-1.61.0.orig/libs/locale/build/has_icu_test.cpp 2016-05-06 00:12:06.000000000 +0300 +++ boost-1.61.0.patched/libs/locale/build/has_icu_test.cpp 2016-05-16 15:38:19.705320700 +0300 @@ -15,10 +15,11 @@ #include #include +/* #if defined(_MSC_VER) && !defined(_DLL) #error "Mixing ICU with a static runtime doesn't work" #endif - +*/ int main() { icu::Locale loc; diff -Naur boost-1.61.0.orig/libs/locale/build/Jamfile.v2 boost-1.61.0.patched/libs/locale/build/Jamfile.v2 --- boost-1.61.0.orig/libs/locale/build/Jamfile.v2 2016-05-06 00:12:06.000000000 +0300 +++ boost-1.61.0.patched/libs/locale/build/Jamfile.v2 2016-05-16 15:38:19.708320900 +0300 @@ -3,8 +3,6 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt. - - project /boost/locale : source-location ../src ; @@ -14,14 +12,29 @@ import toolset ; import project ; import feature ; -# Features +# Features feature.feature boost.locale.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 ; feature.feature boost.locale.winapi : on off : optional propagated ; +rule path_options ( properties * ) +{ + local result ; + if 64 in $(properties) && msvc in $(properties) + { + result = $(ICU_PATH)/bin64 $(ICU_PATH)/lib64 ; + } + else + { + result = $(ICU_PATH)/bin $(ICU_PATH)/lib ; + } + + return $(result) ; +} + # Configuration of libraries ## iconv @@ -59,7 +72,6 @@ #end xlocale - ICU_PATH = [ modules.peek : ICU_PATH ] ; ICU_LINK = [ modules.peek : ICU_LINK ] ; @@ -70,140 +82,104 @@ } else { - searched-lib icuuc : : icuuc - $(ICU_PATH)/lib - shared - shared ; - - searched-lib icuuc : : msvc - debug - icuucd - $(ICU_PATH)/lib - shared - shared ; - - searched-lib icuuc : : this_is_an_invalid_library_name ; - - searched-lib icudt : : $(ICU_PATH)/lib - icudata - shared - shared ; - - searched-lib icudt : : $(ICU_PATH)/lib - icudt - msvc - shared - shared ; - - searched-lib icudt : : this_is_an_invalid_library_name ; - - searched-lib icuin : : $(ICU_PATH)/lib - icui18n - shared - shared ; - - searched-lib icuin : : msvc - debug - icuind - $(ICU_PATH)/lib - shared - shared ; - - searched-lib icuin : : msvc - release - icuin - $(ICU_PATH)/lib - shared - shared ; - - searched-lib icuin : : this_is_an_invalid_library_name ; - - explicit icuuc icudt icuin ; - - ICU_OPTS = $(ICU_PATH)/include - icuuc/shared/shared - icudt/shared/shared - icuin/shared/shared - $(ICU_PATH)/bin - shared ; - - - - searched-lib icuuc_64 : : icuuc - $(ICU_PATH)/lib64 - shared - shared ; - - searched-lib icuuc_64 : : msvc - debug - icuucd - $(ICU_PATH)/lib64 - shared - shared ; - - searched-lib icuuc_64 : : this_is_an_invalid_library_name ; - - searched-lib icudt_64 : : $(ICU_PATH)/lib64 - icudata - shared - shared ; - - searched-lib icudt_64 : : $(ICU_PATH)/lib64 - icudt - msvc - shared - shared ; - - searched-lib icudt_64 : : this_is_an_invalid_library_name ; - - searched-lib icuin_64 : : $(ICU_PATH)/lib64 - icui18n - shared - shared ; - - searched-lib icuin_64 : : msvc - debug - icuind - $(ICU_PATH)/lib64 - shared - shared ; - - searched-lib icuin_64 : : msvc - release - icuin - $(ICU_PATH)/lib64 - shared - shared ; - - searched-lib icuin_64 : : this_is_an_invalid_library_name ; - - explicit icuuc_64 icudt_64 icuin_64 ; - - ICU64_OPTS = $(ICU_PATH)/include - icuuc_64/shared/shared - icudt_64/shared/shared - icuin_64/shared/shared - $(ICU_PATH)/bin64 - shared ; - - + local iculibs = in uc dt ; + + for libtxt in $(iculibs) + { + lib icu$(libtxt) : : msvc + debug + 64 + sicu$(libtxt)d + $(ICU_PATH)/lib64 + static + static ; + + lib icu$(libtxt) : : msvc + release + 64 + sicu$(libtxt) + $(ICU_PATH)/lib64 + static + static ; + + lib icu$(libtxt) : : msvc + release + 64 + icu$(libtxt) + $(ICU_PATH)/lib64 + shared + shared ; + + lib icu$(libtxt) : : msvc + debug + 64 + icu$(libtxt)d + $(ICU_PATH)/lib64 + shared + shared ; + + + lib icu$(libtxt) : : msvc + debug + 32 + sicu$(libtxt)d + $(ICU_PATH)/lib + static + static ; + + lib icu$(libtxt) : : msvc + release + 32 + sicu$(libtxt) + $(ICU_PATH)/lib + static + static ; + + lib icu$(libtxt) : : msvc + release + 32 + icu$(libtxt) + $(ICU_PATH)/lib + shared + shared ; + + lib icu$(libtxt) : : msvc + debug + 32 + icu$(libtxt)d + $(ICU_PATH)/lib + shared + shared + @path_options ; + + lib icu$(libtxt) : : this_is_an_invalid_library_name ; + } + + explicit icuin ; + explicit icuuc ; + explicit icudt ; + + + ICU_OPTS = + $(ICU_PATH)/include + BOOST_HAS_ICU=1 + icuin/@path_options + icuuc/@path_options + icudt/@path_options + ; } obj has_icu_obj : ../build/has_icu_test.cpp : $(ICU_OPTS) ; -obj has_icu64_obj : ../build/has_icu_test.cpp : $(ICU64_OPTS) ; - exe has_icu : has_icu_obj : $(ICU_OPTS) ; -exe has_icu64 : has_icu64_obj : $(ICU64_OPTS) ; -explicit has_icu has_icu64 ; +explicit has_icu ; # This function is called whenever the 'boost_locale' metatarget # below is generated and figures what external components we have, # what user wants, and what sources have to be compiled in the end. rule configure-full ( properties * : flags-only ) -{ - +{ local result ; local flags-result ; @@ -236,15 +212,53 @@ if ! off in $(properties) { - if [ configure.builds has_icu : $(properties) : "icu" ] + local bits ; + local xbits = "" ; + + if 32 in $(properties) + { + bits = "icu (32-bit)" ; + } + else if 64 in $(properties) + { + bits = "icu (64-bit)" ; + xbits = "64" ; + } + + if [ configure.builds has_icu : $(properties) : $(bits) ] { found-icu = true ; flags-result += BOOST_LOCALE_WITH_ICU=1 $(ICU_OPTS) ; - } - else if [ configure.builds has_icu64 : $(properties) : "icu (lib64)" ] - { - found-icu = true ; - flags-result += BOOST_LOCALE_WITH_ICU=1 $(ICU64_OPTS) ; + + flags-result += $(ICU_PATH)/include ; + flags-result += BOOST_HAS_ICU=1 ; + + if msvc in $(properties) + { + if static in $(properties) && static in $(properties) + { + flags-result += U_STATIC_IMPLEMENTATION=1 ; + + local libsuf = "" ; + + if debug in $(properties) + { + libsuf = "d" ; + } + + local iculibs = in uc dt ; + + for libtxt in $(iculibs) + { + local p = $(ICU_PATH)/lib$(xbits)/sicu$(libtxt)$(libsuf).lib ; + flags-result += $(p) ; + } + } + else + { + flags-result += BOOST_LOCALE_DYN_LINK=1 ; + } + } } if $(found-icu) @@ -432,7 +446,6 @@ : # Don't link explicitly, not required BOOST_THREAD_NO_LIB=1 - shared:BOOST_LOCALE_DYN_LINK=1 multi # Meanwhile remove this @configure diff -Naur boost-1.61.0.orig/libs/regex/build/has_icu_test.cpp boost-1.61.0.patched/libs/regex/build/has_icu_test.cpp --- boost-1.61.0.orig/libs/regex/build/has_icu_test.cpp 2016-05-06 00:13:00.000000000 +0300 +++ boost-1.61.0.patched/libs/regex/build/has_icu_test.cpp 2016-05-16 15:38:19.710321000 +0300 @@ -10,29 +10,21 @@ */ #include +#include #include #include #include -#include -#include -#include +/* #if defined(_MSC_VER) && !defined(_DLL) #error "Mixing ICU with a static runtime doesn't work" #endif - +*/ int main() { - // To detect possible binary mismatches between the installed ICU build, and whatever - // C++ std lib's we're using, we need to: - // * Make sure we call ICU C++ API's - // * Make sure we call std lib C++ API's as well (cout). - // * Be sure this program is run, not just built. + icu::Locale loc; UErrorCode err = U_ZERO_ERROR; UChar32 c = ::u_charFromName(U_UNICODE_CHAR_NAME, "GREEK SMALL LETTER ALPHA", &err); - std::cout << (int)c << std::endl; - if(err > 0) return err; - U_NAMESPACE_QUALIFIER Locale l; - boost::scoped_ptr p_col(U_NAMESPACE_QUALIFIER Collator::createInstance(l, err)); - return err > 0 ? err : 0; + return err; } + diff -Naur boost-1.61.0.orig/libs/regex/build/Jamfile.v2 boost-1.61.0.patched/libs/regex/build/Jamfile.v2 --- boost-1.61.0.orig/libs/regex/build/Jamfile.v2 2016-05-06 00:13:00.000000000 +0300 +++ boost-1.61.0.patched/libs/regex/build/Jamfile.v2 2016-05-16 15:38:19.713321200 +0300 @@ -1,9 +1,30 @@ +# +# This is a modified Jamfile for Boost.Regex +# It is supposed to be used ONLY on Windows with MSVC!! +# +# It links Boost.Regex properly against the shared/static ICU libraries. +# Note: Using this you can only get static with static runtimes. +# If you mix static linking without shared runtimes and vice +# versa do not expect it to work or even compile properly. +# +# To use it do: +# b2 -sICU_PATH=D:\dev\icu link=shared runtime-link=shared --with-regex +# or +# b2 -sICU_PATH=D:\dev\icu link=static runtime-link=static --with-regex +# +# stathis - 2016/01/26 +# + # copyright John Maddock 2003 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt. +import configure ; import modules ; +import common ; +import regex ; +import feature ; project : requirements # default to all warnings on: @@ -22,17 +43,31 @@ else { result = $(ICU_PATH)/bin $(ICU_PATH)/lib ; - } + } + return $(result) ; } +rule print_options ( properties * ) +{ + echo " " ; + echo "==== Configuration Properties ====" ; + echo " " ; + + for a in $(properties) + { + echo " " $(a) ; + } + + echo " " ; + echo "==================================" ; +} # # ICU configuration: # if ! $(disable-icu) { - if [ modules.peek : ICU_PATH ] { ICU_PATH = [ modules.peek : ICU_PATH ] ; @@ -48,91 +83,181 @@ } else { - lib icuuc : : shared shared @path_options ; - lib icuuc : : msvc debug icuucd shared shared @path_options ; - lib icuuc : : intel windows debug icuucd shared shared @path_options ; - lib icuuc : : this_is_an_invalid_library_name ; - - lib icudt : : icudata shared shared @path_options ; - lib icudt : : icudt msvc shared shared @path_options ; - lib icudt : : icudt intel windows shared shared @path_options ; - lib icudt : : this_is_an_invalid_library_name ; - - lib icuin : : icui18n shared shared @path_options ; - lib icuin : : msvc debug icuind shared shared @path_options ; - lib icuin : : msvc icuin shared shared @path_options ; - lib icuin : : intel windows debug icuind shared shared @path_options ; - lib icuin : : intel windows icuin shared shared @path_options ; - lib icuin : : this_is_an_invalid_library_name ; - - if $(ICU_PATH) - { - icuucd_name = [ GLOB $(ICU_PATH)/bin : icuuc??d.dll ] ; - if ! $(icuucd_name) - { - icuucd_name = [ GLOB $(ICU_PATH)/bin64 : icuuc??d.dll ] ; - } - icuuc_name = [ GLOB $(ICU_PATH)/bin : icuuc??.dll ] ; - if ! $(icuuc_name) - { - icuuc_name = [ GLOB $(ICU_PATH)/bin64 : icuuc??.dll ] ; - } - icudt_name = [ GLOB $(ICU_PATH)/bin : icudt??.dll ] ; - if ! $(icudt_name) - { - icudt_name = [ GLOB $(ICU_PATH)/bin64 : icudt??.dll ] ; - } - icuin_name = [ GLOB $(ICU_PATH)/bin : icuin??.dll ] ; - if ! $(icuin_name) - { - icuin_name = [ GLOB $(ICU_PATH)/bin64 : icuin??.dll ] ; - } - icuind_name = [ GLOB $(ICU_PATH)/bin : icuin??d.dll ] ; - if ! $(icuind_name) - { - icuind_name = [ GLOB $(ICU_PATH)/bin64 : icuin??d.dll ] ; - } - - #ECHO $(icuucd_name:B) $(icuuc_name:B) $(icudt_name:B) $(icuin_name:B) $(icuind_name:B) ; - } - - ICU_OPTS = - $(ICU_PATH)/include - icuuc/shared/shared - icudt/shared/shared - icuin/shared/shared - BOOST_HAS_ICU=1 - shared - # As of ICU-54 this does not work anymore (release mode): - #msvc:/delayload:$(icuucd_name:B).dll - #msvc:/delayload:$(icuuc_name:B).dll - #msvc:/delayload:$(icudt_name:B).dll - #msvc:/delayload:$(icuin_name:B).dll - #msvc:/delayload:$(icuind_name:B).dll - #msvc:delayimp.lib - ; - } + local iculibs = in uc dt ; + + for libtxt in $(iculibs) + { + lib icu$(libtxt) : : msvc + debug + 64 + sicu$(libtxt)d + $(ICU_PATH)/lib64 + static + static ; + + lib icu$(libtxt) : : msvc + release + 64 + sicu$(libtxt) + $(ICU_PATH)/lib64 + static + static ; + + lib icu$(libtxt) : : msvc + release + 64 + icu$(libtxt) + $(ICU_PATH)/lib64 + shared + shared ; + + lib icu$(libtxt) : : msvc + debug + 64 + icu$(libtxt)d + $(ICU_PATH)/lib64 + shared + shared ; + + + lib icu$(libtxt) : : msvc + debug + 32 + sicu$(libtxt)d + $(ICU_PATH)/lib + static + static ; + + lib icu$(libtxt) : : msvc + release + 32 + sicu$(libtxt) + $(ICU_PATH)/lib + static + static ; + + lib icu$(libtxt) : : msvc + release + 32 + icu$(libtxt) + $(ICU_PATH)/lib + shared + shared ; + + lib icu$(libtxt) : : msvc + debug + 32 + icu$(libtxt)d + $(ICU_PATH)/lib + shared + shared + @path_options ; + + lib icu$(libtxt) : : this_is_an_invalid_library_name ; + } + + explicit icuin ; + explicit icuuc ; + explicit icudt ; + + + ICU_OPTS = + $(ICU_PATH)/include + BOOST_HAS_ICU=1 + icuin/@path_options + icuuc/@path_options + icudt/@path_options + ; + } } -actions regex_simple_run_action + +obj has_icu_obj : ../build/has_icu_test.cpp : $(ICU_OPTS) ; +exe has_icu : has_icu_obj : $(ICU_OPTS) ; + +explicit has_icu ; + + +# This function is called whenever the 'boost_locale' metatarget +# below is generated and figures what external components we have, +# what user wants, and what sources have to be compiled in the end. +rule configure-full ( properties * : flags-only ) { - $(>) > $(<) + local result ; + local flags-result ; + local found-icu ; + + if ! off in $(properties) + { + local bits ; + local xbits = "" ; + + if 32 in $(properties) + { + bits = "icu (32-bit)" ; + } + else if 64 in $(properties) + { + bits = "icu (64-bit)" ; + xbits = "64" ; + } + + if [ configure.builds has_icu : $(properties) : $(bits) ] + { + found-icu = true ; + flags-result += BOOST_REGEX_WITH_ICU=1 $(ICU_OPTS) ; + + flags-result += $(ICU_PATH)/include ; + flags-result += BOOST_HAS_ICU=1 ; + + if msvc in $(properties) + { + if static in $(properties) && static in $(properties) + { + flags-result += U_STATIC_IMPLEMENTATION=1 ; + + local libsuf = "" ; + + if debug in $(properties) + { + libsuf = "d" ; + } + + local iculibs = in uc dt ; + + for libtxt in $(iculibs) + { + local p = $(ICU_PATH)/lib$(xbits)/sicu$(libtxt)$(libsuf).lib ; + flags-result += $(p) ; + } + } + else + { + flags-result += BOOST_REGEX_DYN_LINK=1 ; + } + } + } + } + + if "$(flags-only)" = "flags" + { + return $(flags-result) ; + } + else { + result += $(flags-result) ; + return $(result) ; + } + } -rule regex-run-simple ( sources + : args * : input-files * : requirements * : target-name ) +rule configure ( properties * ) { - exe $(target-name)_exe : $(sources) : $(requirements) ; - explicit $(target-name)_exe ; - make $(target-name).output : $(target-name)_exe : @regex_simple_run_action ; - explicit $(target-name).output ; - alias $(target-name) : $(target-name).output ; + local result = [ configure-full $(properties) : "all" ] ; + return $(result) ; + } -regex-run-simple has_icu_test.cpp : : : $(ICU_OPTS) : has_icu ; -explicit has_icu ; - -alias icu_options : : : : [ check-target-builds has_icu : $(ICU_OPTS) : ] ; SOURCES = c_regex_traits.cpp @@ -154,21 +279,9 @@ usinstances.cpp ; -lib boost_regex : ../src/$(SOURCES) icu_options - : - shared:BOOST_REGEX_DYN_LINK=1 - #gcc-mw:static - #gcc-mingw:static - gcc-cygwin:static - sun:static +lib boost_regex : ../src/$(SOURCES) + : + @configure ; boost-install boost_regex ; - - - - - - - -