Index: libs/regex/build/Jamfile.v2 =================================================================== --- libs/regex/build/Jamfile.v2 (revision 55426) +++ libs/regex/build/Jamfile.v2 (working copy) @@ -221,17 +221,20 @@ { lib icucore : : $(gICU_CORE_LIB) $(ICU_SEARCH_OPTS) shared ; ICU_EXTRA_SOURCE = icucore ; + explicit icucore ; } if $(gICU_IN_LIB) { lib icuin : : $(gICU_IN_LIB) $(ICU_SEARCH_OPTS) shared ; ICU_EXTRA_SOURCE += icuin ; + explicit icuin ; } #Added by Tommy Nordgren libicudata must be linked against on Mac OS X if $(gICU_DATA_LIB) { lib icudata : : $(gICU_DATA_LIB) $(ICU_SEARCH_OPTS) shared ; ICU_EXTRA_SOURCE += icudata ; + explicit icudata ; } #End of addition by Tommy Nordgren } @@ -267,9 +270,34 @@ gcc-mingw:static gcc-cygwin:static $(BOOST_REGEX_ICU_OPTS) + @force-shared-linking ; +shared-linking-warning-emitted = ; + +rule force-shared-linking ( properties * ) +{ + if $(gHAS_ICU) + { + if static in $(properties) || + static in $(properties) + { + if ! $(shared-linking-warning-emitted) + { + shared-linking-warning-emitted = 1 ; + ECHO "warning: when using ICU, Boost.Regex must be a dynamic library " ; + ECHO "warning: forcing link=shared runtime-link=shared for Boost.Regex" ; + } + } + + return shared shared ; + } +} + + + alias icu_options : $(ICU_EXTRA_SOURCE) : : : $(BOOST_REGEX_ICU_OPTS) ; +explicit icu_options ; boost-install boost_regex ;