From 86860c7c53c1e1e2c28e8ad9a03cdb3bd89fb5f1 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 22 Apr 2010 12:54:07 +0200 Subject: Add BOOST_LINK_SYSTEM flag for explicit libboost_system linking --- README | 10 ++++++++-- .../build/import/libboost/configuration-dynamic.make | 6 ++++++ .../build/import/libboost/configuration-dynamic.make | 6 ++++++ xsde/build/import/libboost/configuration-dynamic.make | 6 ++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/README b/README index 49e00bb..f206d07 100644 --- a/README +++ b/README @@ -21,13 +21,14 @@ the CPPFLAGS and LDFLAGS variables, respectively. The build system supports the following variables: CXX (defaults to g++ if not set) +AR (defaults to ar if not set) +RANLIB (defaults to ranlib if not set) CPPFLAGS CXXFLAGS LDFALGS LIBS BOOST_LIB_SUFFIX -AR (defaults to ar if not set) -RANLIB (defaults to ranlib if not set) +BOOST_LINK_SYSTEM For example: @@ -38,6 +39,11 @@ Boost library suffix. For example, if your Boost library names are in the libboost_regex-gcc41-mt-d.so format, then you will need to set BOOST_LIB_SUFFIX to -gcc41-mt-d. +The BOOST_LINK_SYSTEM variable allows you to specify whether the +Boost system library should be explicitly linked to which may be +required by newer linkers. The valid values are 'y' (default) and +'n'. + If you would like to see the full compiler/linker/etc., command lines, you can add verbose=1 to the make command line: diff --git a/libbackend-elements/build/import/libboost/configuration-dynamic.make b/libbackend-elements/build/import/libboost/configuration-dynamic.make index 5d5209b..ab55882 100644 --- a/libbackend-elements/build/import/libboost/configuration-dynamic.make +++ b/libbackend-elements/build/import/libboost/configuration-dynamic.make @@ -1,2 +1,8 @@ libboost_installed := y libboost_suffix := $(BOOST_LIB_SUFFIX) + +ifeq ($(BOOST_LINK_SYSTEM),n) +libboost_system := n +else +libboost_system := y +endif diff --git a/libxsd-frontend/build/import/libboost/configuration-dynamic.make b/libxsd-frontend/build/import/libboost/configuration-dynamic.make index 5d5209b..ab55882 100644 --- a/libxsd-frontend/build/import/libboost/configuration-dynamic.make +++ b/libxsd-frontend/build/import/libboost/configuration-dynamic.make @@ -1,2 +1,8 @@ libboost_installed := y libboost_suffix := $(BOOST_LIB_SUFFIX) + +ifeq ($(BOOST_LINK_SYSTEM),n) +libboost_system := n +else +libboost_system := y +endif diff --git a/xsde/build/import/libboost/configuration-dynamic.make b/xsde/build/import/libboost/configuration-dynamic.make index 5d5209b..ab55882 100644 --- a/xsde/build/import/libboost/configuration-dynamic.make +++ b/xsde/build/import/libboost/configuration-dynamic.make @@ -1,2 +1,8 @@ libboost_installed := y libboost_suffix := $(BOOST_LIB_SUFFIX) + +ifeq ($(BOOST_LINK_SYSTEM),n) +libboost_system := n +else +libboost_system := y +endif -- cgit v1.1