From 3a93e584ba3173b2fb2a3e4b5d734f4826df6eb9 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 29 Sep 2009 13:35:53 +0200 Subject: Update boost import stub --- build/import/libboost/configuration-rules.make | 2 +- build/import/libboost/configure | 48 ++++++++------------------ build/import/libboost/date-time/rules.make | 6 ++-- build/import/libboost/date-time/stub.make | 4 +-- build/import/libboost/filesystem/rules.make | 6 ++-- build/import/libboost/filesystem/stub.make | 4 +-- build/import/libboost/regex/rules.make | 6 ++-- build/import/libboost/regex/stub.make | 4 +-- build/import/libboost/serialization/rules.make | 6 ++-- build/import/libboost/serialization/stub.make | 4 +-- build/import/libboost/version | 2 +- xsd/makefile | 2 -- 12 files changed, 37 insertions(+), 57 deletions(-) diff --git a/build/import/libboost/configuration-rules.make b/build/import/libboost/configuration-rules.make index 2e89c6e..bfe3116 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 -# copyright : Copyright (c) 2005-2009 Boris Kolpackov +# copyright : Copyright (c) 2005-2008 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 9bb9085..2c62d45 100755 --- a/build/import/libboost/configure +++ b/build/import/libboost/configure @@ -2,7 +2,7 @@ # file : build/import/libboost/configure # author : Boris Kolpackov -# copyright : Copyright (c) 2005-2009 Boris Kolpackov +# copyright : Copyright (c) 2005-2008 Boris Kolpackov # license : GNU GPL v2; see accompanying LICENSE file @@ -26,30 +26,13 @@ $echo installed=`read_y_n y` -path= -type= - if [ "$installed" = "n" ]; then - version= - - while [ -z "$version" ]; do - - $echo - $echo "Please enter the 'boost' root directory." - $echo - - root=`read_path --directory --exist` - - version=`sed -e 's/^#define BOOST_LIB_VERSION "\(.*\)"[ ]*$/\1/' -e t -e d \ -$root/boost/version.hpp 2>/dev/null` - - if [ $? != 0 -o -z "$version" ]; then + $echo + $echo "Please enter the 'boost' root directory." + $echo - version= - echo "Unable to read version information from $root/boost/version.hpp" - fi - done + root=`read_path --directory --exist` $echo $echo "Please select the library type you would like to use:" @@ -59,25 +42,24 @@ $root/boost/version.hpp 2>/dev/null` $echo type=`read_option "archive shared" "shared"` +fi - $echo - $echo "For boost 1.34.0 and later, please enter the toolset version" - $echo "that is embedded into the library names. For example, for" - $echo "gcc34 enter 34. For previous versions of boost leave this" - $echo "field blank." - $echo +$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" +$echo "Otherwise leave this field blank." +$echo - toolset= - read -e -p "[]: " toolset -fi +suffix= +read -e -p "[]: " suffix echo libboost_installed := $installed >$1 +echo libboost_suffix := $suffix >>$1 if [ "$installed" = "n" ]; then echo libboost_root := $root >>$1 echo libboost_type := $type >>$1 - echo libboost_version := $version >>$1 - echo libboost_toolset := $toolset >>$1 fi diff --git a/build/import/libboost/date-time/rules.make b/build/import/libboost/date-time/rules.make index f136cc4..2db64c7 100644 --- a/build/import/libboost/date-time/rules.make +++ b/build/import/libboost/date-time/rules.make @@ -1,6 +1,6 @@ # file : build/import/libboost/date-time/rules.make # author : Boris Kolpackov -# copyright : Copyright (c) 2005-2009 Boris Kolpackov +# copyright : Copyright (c) 2005-2008 Boris Kolpackov # license : GNU GPL v2; see accompanying LICENSE file $(dcf_root)/import/libboost/%: root := $(libboost_root) @@ -11,13 +11,13 @@ $(dcf_root)/import/libboost/date-time/date-time.l: \ ifeq ($(libboost_type),archive) $(dcf_root)/import/libboost/date-time/date-time.l: \ - $(libboost_root)/stage/lib/libboost_date_time-gcc$(libboost_toolset)-$(libboost_version).a + $(libboost_root)/stage/lib/libboost_date_time$(libboost_suffix).a @echo $< >$@ else $(dcf_root)/import/libboost/date-time/date-time.l: \ - $(libboost_root)/stage/lib/libboost_date_time-gcc$(libboost_toolset)-$(libboost_version).so + $(libboost_root)/stage/lib/libboost_date_time$(libboost_suffix).so @echo $< >$@ @echo rpath:$(root)/stage/lib >>$@ diff --git a/build/import/libboost/date-time/stub.make b/build/import/libboost/date-time/stub.make index 5f57a42..982f338 100644 --- a/build/import/libboost/date-time/stub.make +++ b/build/import/libboost/date-time/stub.make @@ -1,6 +1,6 @@ # file : build/import/libboost/date-time/stub.make # author : Boris Kolpackov -# copyright : Copyright (c) 2005-2009 Boris Kolpackov +# copyright : Copyright (c) 2005-2008 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,7 @@ ifdef libboost_installed ifeq ($(libboost_installed),y) -$(call export,l: -lboost_date_time,cpp_options: ) +$(call export,l: -lboost_date_time$(libboost_suffix),cpp_options: ) else diff --git a/build/import/libboost/filesystem/rules.make b/build/import/libboost/filesystem/rules.make index 8a1666e..6ecea6c 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 -# copyright : Copyright (c) 2005-2009 Boris Kolpackov +# copyright : Copyright (c) 2005-2008 Boris Kolpackov # license : GNU GPL v2; see accompanying LICENSE file #@@ Should use message everywhere. @@ -14,13 +14,13 @@ $(dcf_root)/import/libboost/filesystem/filesystem.l: \ ifeq ($(libboost_type),archive) $(dcf_root)/import/libboost/filesystem/filesystem.l: \ - $(libboost_root)/stage/lib/libboost_filesystem-gcc$(libboost_toolset)-$(libboost_version).a + $(libboost_root)/stage/lib/libboost_filesystem$(libboost_suffix).a @echo $< >$@ else $(dcf_root)/import/libboost/filesystem/filesystem.l: \ - $(libboost_root)/stage/lib/libboost_filesystem-gcc$(libboost_toolset)-$(libboost_version).so + $(libboost_root)/stage/lib/libboost_filesystem$(libboost_suffix).so @echo $< >$@ @echo rpath:$(root)/stage/lib >>$@ diff --git a/build/import/libboost/filesystem/stub.make b/build/import/libboost/filesystem/stub.make index d5e5500..70e5356 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 -# copyright : Copyright (c) 2005-2009 Boris Kolpackov +# copyright : Copyright (c) 2005-2008 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,7 @@ ifdef libboost_installed ifeq ($(libboost_installed),y) -$(call export,l: -lboost_filesystem,cpp_options: ) +$(call export,l: -lboost_filesystem$(libboost_suffix),cpp_options: ) else diff --git a/build/import/libboost/regex/rules.make b/build/import/libboost/regex/rules.make index 10303be..3b5a0f8 100644 --- a/build/import/libboost/regex/rules.make +++ b/build/import/libboost/regex/rules.make @@ -1,6 +1,6 @@ # file : build/import/libboost/regex/rules.make # author : Boris Kolpackov -# copyright : Copyright (c) 2005-2009 Boris Kolpackov +# copyright : Copyright (c) 2005-2008 Boris Kolpackov # license : GNU GPL v2; see accompanying LICENSE file $(dcf_root)/import/libboost/%: root := $(libboost_root) @@ -11,13 +11,13 @@ $(dcf_root)/import/libboost/regex/regex.l: \ ifeq ($(libboost_type),archive) $(dcf_root)/import/libboost/regex/regex.l: \ - $(libboost_root)/stage/lib/libboost_regex-gcc$(libboost_toolset)-$(libboost_version).a + $(libboost_root)/stage/lib/libboost_regex$(libboost_suffix).a @echo $< >$@ else $(dcf_root)/import/libboost/regex/regex.l: \ - $(libboost_root)/stage/lib/libboost_regex-gcc$(libboost_toolset)-$(libboost_version).so + $(libboost_root)/stage/lib/libboost_regex$(libboost_suffix).so @echo $< >$@ @echo rpath:$(root)/stage/lib >>$@ diff --git a/build/import/libboost/regex/stub.make b/build/import/libboost/regex/stub.make index 9af79d2..2095e33 100644 --- a/build/import/libboost/regex/stub.make +++ b/build/import/libboost/regex/stub.make @@ -1,6 +1,6 @@ # file : build/import/libboost/regex/stub.make # author : Boris Kolpackov -# copyright : Copyright (c) 2005-2009 Boris Kolpackov +# copyright : Copyright (c) 2005-2008 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,7 @@ ifdef libboost_installed ifeq ($(libboost_installed),y) -$(call export,l: -lboost_regex,cpp_options: ) +$(call export,l: -lboost_regex$(libboost_suffix),cpp_options: ) else diff --git a/build/import/libboost/serialization/rules.make b/build/import/libboost/serialization/rules.make index a413c28..8d6f879 100644 --- a/build/import/libboost/serialization/rules.make +++ b/build/import/libboost/serialization/rules.make @@ -1,6 +1,6 @@ # file : build/import/libboost/serialization/rules.make # author : Boris Kolpackov -# copyright : Copyright (c) 2005-2009 Boris Kolpackov +# copyright : Copyright (c) 2005-2008 Boris Kolpackov # license : GNU GPL v2; see accompanying LICENSE file $(dcf_root)/import/libboost/%: root := $(libboost_root) @@ -11,13 +11,13 @@ $(dcf_root)/import/libboost/serialization/serialization.l: \ ifeq ($(libboost_type),archive) $(dcf_root)/import/libboost/serialization/serialization.l: \ - $(libboost_root)/stage/lib/libboost_serialization-gcc$(libboost_toolset)-$(libboost_version).a + $(libboost_root)/stage/lib/libboost_serialization$(libboost_suffix).a @echo $< >$@ else $(dcf_root)/import/libboost/serialization/serialization.l: \ - $(libboost_root)/stage/lib/libboost_serialization-gcc$(libboost_toolset)-$(libboost_version).so + $(libboost_root)/stage/lib/libboost_serialization$(libboost_suffix).so @echo $< >$@ @echo rpath:$(root)/stage/lib >>$@ diff --git a/build/import/libboost/serialization/stub.make b/build/import/libboost/serialization/stub.make index 2158e49..fc69dbb 100644 --- a/build/import/libboost/serialization/stub.make +++ b/build/import/libboost/serialization/stub.make @@ -1,6 +1,6 @@ # file : build/import/libboost/serialization/stub.make # author : Boris Kolpackov -# copyright : Copyright (c) 2005-2009 Boris Kolpackov +# copyright : Copyright (c) 2005-2008 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,7 @@ ifdef libboost_installed ifeq ($(libboost_installed),y) -$(call export,l: -lboost_serialization,cpp_options: ) +$(call export,l: -lboost_serialization$(libboost_suffix),cpp_options: ) else diff --git a/build/import/libboost/version b/build/import/libboost/version index 1d0ba9e..a918a2a 100644 --- a/build/import/libboost/version +++ b/build/import/libboost/version @@ -1 +1 @@ -0.4.0 +0.6.0 diff --git a/xsd/makefile b/xsd/makefile index dc33d6d..e58b9dd 100644 --- a/xsd/makefile +++ b/xsd/makefile @@ -76,8 +76,6 @@ $(call import,\ $(scf_root)/import/libbackend-elements/stub.make,\ l: be.l,cpp-options: be.l.cpp-options) -# This is needed because libbe does not link properly to regex. -# $(call import,\ $(scf_root)/import/libboost/regex/stub.make,\ l: re.l,cpp-options: re.l.cpp-options) -- cgit v1.1