From aebac1401f9ddabb84c222481301d25beea1988d Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Mon, 14 Jan 2019 21:08:25 +0300 Subject: [PATCH 1/2] Remove linking with Boost.System. Since Boost.System is header-only now, no need to link with the library. --- build/Jamfile.v2 | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 index 578e722e..43ab0014 100644 --- a/libs/locale/build/Jamfile.v2 +++ b/libs/locale/build/Jamfile.v2 @@ -382,9 +382,6 @@ rule configure-full ( properties * : flags-only ) result += util/gregorian.cpp ; } - result += ../../system/build//boost_system ; - - if "$(flags-only)" = "flags" { return $(flags-result) ; From b01aab1d28c9b32d107ae39c76c9af988420d476 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Mon, 14 Jan 2019 21:10:38 +0300 Subject: [PATCH 2/2] Trim trailing spaces. --- build/Jamfile.v2 | 119 +++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 60 deletions(-) diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 index 43ab0014..97dd68c7 100644 --- a/libs/locale/build/Jamfile.v2 +++ b/libs/locale/build/Jamfile.v2 @@ -1,6 +1,6 @@ # copyright John Maddock 2003, Artyom Beilis 2010 -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at +# 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. @@ -32,11 +32,11 @@ explicit has_iconv ; ICONV_PATH = [ modules.peek : ICONV_PATH ] ; -lib iconv - : +lib iconv + : : $(ICONV_PATH)/lib shared shared : - : $(ICONV_PATH)/include + : $(ICONV_PATH)/include ; explicit iconv ; @@ -45,8 +45,8 @@ obj has_iconv_libc_ext : ../build/has_iconv.cpp iconv ; exe has_external_iconv : has_iconv_libc_ext iconv ; explicit has_external_iconv ; -exe accepts_shared_option : ../build/option.cpp - : -shared-libstdc++ +exe accepts_shared_option : ../build/option.cpp + : -shared-libstdc++ -shared-libgcc -shared-libstdc++ -shared-libgcc @@ -71,8 +71,8 @@ if $(ICU_LINK) else { searched-lib icuuc : : icuuc - $(ICU_PATH)/lib - shared + $(ICU_PATH)/lib + shared shared ; searched-lib icuuc : : msvc @@ -120,9 +120,9 @@ else explicit icuuc icudt icuin ; - ICU_OPTS = $(ICU_PATH)/include - icuuc/shared/shared - icudt/shared/shared + ICU_OPTS = $(ICU_PATH)/include + icuuc/shared/shared + icudt/shared/shared icuin/shared/shared $(ICU_PATH)/bin shared ; @@ -130,8 +130,8 @@ else searched-lib icuuc_64 : : icuuc - $(ICU_PATH)/lib64 - shared + $(ICU_PATH)/lib64 + shared shared ; searched-lib icuuc_64 : : msvc @@ -179,14 +179,14 @@ else explicit icuuc_64 icudt_64 icuin_64 ; - ICU64_OPTS = $(ICU_PATH)/include - icuuc_64/shared/shared - icudt_64/shared/shared + ICU64_OPTS = $(ICU_PATH)/include + icuuc_64/shared/shared + icudt_64/shared/shared icuin_64/shared/shared $(ICU_PATH)/bin64 shared ; - - + + } obj has_icu_obj : ../build/has_icu_test.cpp : $(ICU_OPTS) ; @@ -206,11 +206,11 @@ rule configure-full ( properties * : flags-only ) local result ; local flags-result ; - + local found-iconv ; - + if on in $(properties) - || ! in $(properties:G) + || ! in $(properties:G) && ! solaris in $(properties) { # See if iconv is bundled with standard library. @@ -218,7 +218,7 @@ rule configure-full ( properties * : flags-only ) { found-iconv = true ; } - else + else { if [ configure.builds has_external_iconv : $(properties) : "iconv (separate)" ] { @@ -226,8 +226,8 @@ rule configure-full ( properties * : flags-only ) result += iconv ; } } - } - if $(found-iconv) + } + if $(found-iconv) { flags-result += BOOST_LOCALE_WITH_ICONV=1 ; } @@ -249,7 +249,7 @@ rule configure-full ( properties * : flags-only ) if $(found-icu) { - ICU_SOURCES = + ICU_SOURCES = boundary codecvt collator @@ -260,20 +260,20 @@ rule configure-full ( properties * : flags-only ) numeric time_zone ; - - result += icu/$(ICU_SOURCES).cpp - ../../thread/build//boost_thread + + result += icu/$(ICU_SOURCES).cpp + ../../thread/build//boost_thread ; } } - - if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) && ! cygwin in $(properties) + + if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) && ! cygwin in $(properties) { ECHO "- Boost.Locale needs either iconv or ICU library to be built." ; result += no ; } - + if ! in $(properties:G) { if sun in $(properties) @@ -283,9 +283,9 @@ rule configure-full ( properties * : flags-only ) else { properties += on ; - } + } } - + if off in $(properties) { flags-result += BOOST_LOCALE_NO_STD_BACKEND=1 ; @@ -301,38 +301,38 @@ rule configure-full ( properties * : flags-only ) ; result += std/$(STD_SOURCES).cpp ; } - + if ! in $(properties:G) { - if windows in $(properties) + if windows in $(properties) || cygwin in $(properties) { properties += on ; - } + } else { properties += off ; - } + } } - if windows in $(properties) - && gcc in $(properties) + if windows in $(properties) + && gcc in $(properties) && shared in $(properties) && [ configure.builds accepts_shared_option : $(properties) : "g++ -shared-* supported" ] { - flags-result += -shared-libstdc++ + flags-result += -shared-libstdc++ -shared-libgcc -shared-libstdc++ -shared-libgcc ; } - + if off in $(properties) { flags-result += BOOST_LOCALE_NO_WINAPI_BACKEND=1 ; } else { - WINAPI_SOURCES = + WINAPI_SOURCES = collate converter numeric @@ -340,34 +340,34 @@ rule configure-full ( properties * : flags-only ) ; result += win32/$(WINAPI_SOURCES).cpp ; } - + if ( ! off in $(properties) || ! off in $(properties) ) && ( windows in $(properties) || cygwin in $(properties) ) { result += win32/lcid.cpp ; } - + if ! in $(properties:G) { - if linux in $(properties) - || darwin in $(properties) + if linux in $(properties) + || darwin in $(properties) || ( freebsd in $(properties) && [ configure.builds has_xlocale : $(properties) : "xlocale supported" ] ) { properties += on ; } else { - properties += off ; - } + properties += off ; + } } - + if off in $(properties) { - flags-result += BOOST_LOCALE_NO_POSIX_BACKEND=1 ; + flags-result += BOOST_LOCALE_NO_POSIX_BACKEND=1 ; } else { - POSIX_SOURCES = + POSIX_SOURCES = collate converter numeric @@ -381,12 +381,13 @@ rule configure-full ( properties * : flags-only ) { result += util/gregorian.cpp ; } - - if "$(flags-only)" = "flags" + + if "$(flags-only)" = "flags" { return $(flags-result) ; } - else { + else + { result += $(flags-result) ; return $(result) ; } @@ -396,7 +397,6 @@ rule configure ( properties * ) { local result = [ configure-full $(properties) : "all" ] ; return $(result) ; - } rule configure-flags ( properties * ) @@ -404,15 +404,14 @@ rule configure-flags ( properties * ) local result ; result = [ configure-full $(properties) : "flags" ] ; return $(result) ; - } alias build_options : : : : @configure ; alias build_flags : : : : @configure-flags ; -lib boost_locale - : +lib boost_locale + : encoding/codepage.cpp shared/date_time.cpp shared/format.cpp @@ -425,7 +424,7 @@ lib boost_locale util/codecvt_converter.cpp util/default_locale.cpp util/info.cpp - util/locale_data.cpp + util/locale_data.cpp : # Don't link explicitly, not required BOOST_THREAD_NO_LIB=1