Update boost import stub

5 files changed, 32 insertions, 7 deletions

diff --git a/build/import/libboost/configuration-rules.make b/build/import/libboost/configuration-rules.make
index bfe3116..40fff9f 100644
--- a/build/import/libboost/configuration-rules.make
+++ b/build/import/libboost/configuration-rules.make
@@ -1,6 +1,6 @@
 # file      : build/import/libboost/configuration-rules.make
 # author    : Boris Kolpackov <boris@kolpackov.net>
-# copyright : Copyright (c) 2005-2008 Boris Kolpackov
+# copyright : Copyright (c) 2005-2010 Boris Kolpackov
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 $(dcf_root)/import/libboost/configuration-dynamic.make: | $(dcf_root)/import/libboost/.
diff --git a/build/import/libboost/configure b/build/import/libboost/configure
index 2c62d45..c924a30 100755
--- a/build/import/libboost/configure
+++ b/build/import/libboost/configure
@@ -2,7 +2,7 @@
 
 # file      : build/import/libboost/configure
 # author    : Boris Kolpackov <boris@kolpackov.net>
-# copyright : Copyright (c) 2005-2008 Boris Kolpackov
+# copyright : Copyright (c) 2005-2010 Boris Kolpackov
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 
@@ -45,6 +45,14 @@ if [ "$installed" = "n" ]; then
 fi
 
 $echo
+$echo "Link explicitly to the boost system library? This library"
+$echo "is available since boost 1.35.0 and linking to it explicitly"
+$echo "may be required by newer linkers."
+$echo
+
+link_system=`read_y_n y`
+
+$echo
 $echo "Please enter optional suffix that may be embedded into the"
 $echo "boost library names. For example, if your library names are in"
 $echo "the libboost_regex-gcc41-mt-d.so form, then enter -gcc41-mt-d"
@@ -56,6 +64,7 @@ read -e -p "[]: " suffix
 
 echo libboost_installed := $installed   >$1
 echo libboost_suffix    := $suffix      >>$1
+echo libboost_system    := $link_system >>$1
 
 if [ "$installed" = "n" ]; then
 
diff --git a/build/import/libboost/filesystem/rules.make b/build/import/libboost/filesystem/rules.make
index 6ecea6c..b5febd3 100644
--- a/build/import/libboost/filesystem/rules.make
+++ b/build/import/libboost/filesystem/rules.make
@@ -1,6 +1,6 @@
 # file      : build/import/libboost/filesystem/rules.make
 # author    : Boris Kolpackov <boris@kolpackov.net>
-# copyright : Copyright (c) 2005-2008 Boris Kolpackov
+# copyright : Copyright (c) 2005-2010 Boris Kolpackov
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 #@@ Should use message everywhere.
@@ -13,15 +13,27 @@ $(dcf_root)/import/libboost/filesystem/filesystem.l: \
 
 ifeq ($(libboost_type),archive)
 
+ifeq ($(libboost_system),y)
+$(dcf_root)/import/libboost/filesystem/filesystem.l: \
+  $(libboost_root)/stage/lib/libboost_filesystem$(libboost_suffix).a \
+  $(libboost_root)/stage/lib/libboost_system$(libboost_suffix).a
+else
 $(dcf_root)/import/libboost/filesystem/filesystem.l: \
   $(libboost_root)/stage/lib/libboost_filesystem$(libboost_suffix).a
-	@echo $< >$@
+endif
+	@echo $^ >$@
 
 else
 
+ifeq ($(libboost_system),y)
+$(dcf_root)/import/libboost/filesystem/filesystem.l: \
+  $(libboost_root)/stage/lib/libboost_filesystem$(libboost_suffix).so \
+  $(libboost_root)/stage/lib/libboost_system$(libboost_suffix).so
+else
 $(dcf_root)/import/libboost/filesystem/filesystem.l: \
   $(libboost_root)/stage/lib/libboost_filesystem$(libboost_suffix).so
-	@echo $< >$@
+endif
+	@echo $^ >$@
 	@echo rpath:$(root)/stage/lib >>$@
 
 endif
diff --git a/build/import/libboost/filesystem/stub.make b/build/import/libboost/filesystem/stub.make
index 70e5356..fb7398d 100644
--- a/build/import/libboost/filesystem/stub.make
+++ b/build/import/libboost/filesystem/stub.make
@@ -1,6 +1,6 @@
 # file      : build/import/libboost/filesystem/stub.make
 # author    : Boris Kolpackov <boris@kolpackov.net>
-# copyright : Copyright (c) 2005-2008 Boris Kolpackov
+# copyright : Copyright (c) 2005-2010 Boris Kolpackov
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 $(call include-once,$(scf_root)/import/libboost/configuration-rules.make,$(dcf_root))
@@ -13,7 +13,11 @@ ifdef libboost_installed
 
 ifeq ($(libboost_installed),y)
 
+ifeq ($(libboost_system),y)
+$(call export,l: -lboost_filesystem$(libboost_suffix) -lboost_system$(libboost_suffix),cpp_options: )
+else
 $(call export,l: -lboost_filesystem$(libboost_suffix),cpp_options: )
+endif
 
 else
 
diff --git a/build/import/libboost/version b/build/import/libboost/version
index a918a2a..faef31a 100644
--- a/build/import/libboost/version
+++ b/build/import/libboost/version
@@ -1 +1 @@
-0.6.0
+0.7.0