This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 85a6d73326a6f0e90f09edd6889cf1c491441d25 (commit) from d7d29a1067fee45143f3ad12f103dd30555e9ee1 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 85a6d73326a6f0e90f09edd6889cf1c491441d25 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 11 01:28:45 2010 +0200
boost: Update to 1.41.0.
-----------------------------------------------------------------------
Summary of changes: pkgs/core/boost/boost.nm | 63 +++----- .../core/boost/patches/boost-1.39.0-fs_gcc44.patch | 163 -------------------- .../patches/boost-1.39.0-function_template.patch | 15 -- .../boost-1.39.0-unneccessary_iostreams.patch | 11 -- .../patches/boost-1.39.0-version-override.patch | 36 ----- .../patches/boost-1.41.0-iostreams-zlib.patch | 21 +++ pkgs/core/boost/patches/boost-1.41.0-mapnik.patch | 21 +++ .../boost-1.41.0-shared_ptr_serialization.patch | 14 ++ pkgs/core/boost/patches/boost-graph-compile.patch | 12 ++ 9 files changed, 94 insertions(+), 262 deletions(-) delete mode 100644 pkgs/core/boost/patches/boost-1.39.0-fs_gcc44.patch delete mode 100644 pkgs/core/boost/patches/boost-1.39.0-function_template.patch delete mode 100644 pkgs/core/boost/patches/boost-1.39.0-unneccessary_iostreams.patch delete mode 100644 pkgs/core/boost/patches/boost-1.39.0-version-override.patch create mode 100644 pkgs/core/boost/patches/boost-1.41.0-iostreams-zlib.patch create mode 100644 pkgs/core/boost/patches/boost-1.41.0-mapnik.patch create mode 100644 pkgs/core/boost/patches/boost-1.41.0-shared_ptr_serialization.patch create mode 100644 pkgs/core/boost/patches/boost-graph-compile.patch
Difference in files: diff --git a/pkgs/core/boost/boost.nm b/pkgs/core/boost/boost.nm index 174c4f2..1dc5a7a 100644 --- a/pkgs/core/boost/boost.nm +++ b/pkgs/core/boost/boost.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = boost -PKG_VER = 1.39.0 +PKG_VER = 1.41.0 PKG_REL = 0
PKG_MAINTAINER = @@ -34,7 +34,8 @@ PKG_URL = http://www.boost.org/ PKG_LICENSE = Boost PKG_SUMMARY = The Boost C++ Libraries.
-PKG_DEPS += python +PKG_BUILD_DEPS+= cmake +PKG_DEPS += zlib
define PKG_DESCRIPTION Boost provides free peer-reviewed portable C++ source libraries. The \ @@ -46,51 +47,39 @@ define PKG_DESCRIPTION Standards Committee's upcoming C++ Standard Library Technical Report.) endef
-PKG_TARBALL = $(PKG_NAME)_$(subst .,_,$(PKG_VER)).tar.bz2 - -export BOOST_ROOT=$(DIR_APP) -BUILD_FLAGS = -d2 --layout=system variant=release threading=single,multi \ - debug-symbols=on link=shared runtime-link=shared -SONAMEVERSION = 5 +PKG_TARBALL = $(THISAPP).cmake0.tar.gz
CFLAGS += -fno-strict-aliasing +CXXFLAGS += -fno-strict-aliasing
-PARALLELISMFLAGS := -j3 - -DIR_APP = $(DIR_SRC)/$(PKG_NAME)_$(subst .,_,$(PKG_VER)) +DIR_APP = $(DIR_SRC)/$(THISAPP).cmake0
define STAGE_PREPARE_CMDS - # Let bjam use our own cflags - cd $(DIR_APP) && sed -e "s/-O3/$(CFLAGS)/g" -i tools/build/v2/tools/gcc.jam + -mkdir -pv $(DIR_APP)/serial endef
define STAGE_BUILD - # build jam - cd $(DIR_APP)/tools/jam/src && ./build.sh - - # build libs - cd $(DIR_APP) && ./bootstrap.sh \ - --with-toolset=gcc \ - --with-icu - - cd $(DIR_APP) && \ - ./bjam $(BUILD_FLAGS) $(PARALLELISMFLAGS) stage + cd $(DIR_APP)/serial && \ + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DBUILD_TESTS="NONE" \ + -DENABLE_SINGLE_THREADED=YES \ + -DINSTALL_VERSIONED=OFF \ + -DWITH_MPI=OFF \ + -DENABLE_STATIC=OFF \ + -DENABLE_DEBUG=OFF \ + .. + + cd $(DIR_APP)/serial && make VERBOSE=1 #$(PARALLELISMFLAGS) endef
define STAGE_INSTALL - # install libs - -mkdir -pv $(BUILDROOT)/usr/lib - cd $(DIR_APP) && for i in $$(find stage -type f -name "*.so"); do \ - install -v -p -m 755 $$i $(BUILDROOT)/usr/lib/$$(basename $$i).$(PKG_VER); \ - ln -svf $$(basename $$i).$(PKG_VER) $(BUILDROOT)/usr/lib/$$(basename $$i).$(SONAMEVERSION); \ - ln -svf $$(basename $$i).$(SONAMEVERSION) $(BUILDROOT)/usr/lib/$$(basename $$i); \ - done + cd $(DIR_APP)/serial && make install DESTDIR=$(BUILDROOT) + + # Kill any debug library versions that may show up un-invited. + rm -f $(BUILDROOT)/usr/lib/*-d.*
- # install includes - -mkdir -pv $(BUILDROOT)/usr/include - cd $(DIR_APP) && find boost -type d | while read a; do \ - mkdir -pv $(BUILDROOT)/usr/include/$$a; \ - find $$a -mindepth 1 -maxdepth 1 -type f | \ - xargs -r install -v -m 644 -p -t $(BUILDROOT)/usr/include/$$a; \ - done + # Remove cmake configuration files used to build the Boost libraries + find $(BUILDROOT)/usr/lib -name '*.cmake' -exec rm -f {} ; endef diff --git a/pkgs/core/boost/patches/boost-1.39.0-fs_gcc44.patch b/pkgs/core/boost/patches/boost-1.39.0-fs_gcc44.patch deleted file mode 100644 index 235a61e..0000000 --- a/pkgs/core/boost/patches/boost-1.39.0-fs_gcc44.patch +++ /dev/null @@ -1,163 +0,0 @@ -Index: boost/filesystem/operations.hpp -=================================================================== ---- a/boost/filesystem/operations.hpp (revision 52859) -+++ b/boost/filesystem/operations.hpp (working copy) -@@ -659,9 +659,9 @@ - { return is_symlink<wpath>( ph ); } - - inline bool is_empty( const path & ph ) -- { return is_empty<path>( ph ); } -+ { return boost::filesystem::is_empty<path>( ph ); } - inline bool is_empty( const wpath & ph ) -- { return is_empty<wpath>( ph ); } -+ { return boost::filesystem::is_empty<wpath>( ph ); } - - inline bool equivalent( const path & ph1, const path & ph2 ) - { return equivalent<path>( ph1, ph2 ); } -Index: libs/filesystem/test/path_test.cpp -=================================================================== ---- a/libs/filesystem/test/path_test.cpp (revision 52859) -+++ b/libs/filesystem/test/path_test.cpp (working copy) -@@ -27,9 +27,8 @@ - - namespace fs = boost::filesystem; - using boost::filesystem::path; --using boost::next; --using boost::prior; - -+ - #include <boost/detail/lightweight_test.hpp> - - #define PATH_CHECK( a, b ) check( a, b, __LINE__ ) -@@ -480,18 +479,18 @@ - - itr_ck = "foo"; - BOOST_TEST( *itr_ck.begin() == std::string( "foo" ) ); -- BOOST_TEST( next( itr_ck.begin() ) == itr_ck.end() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) ); -- BOOST_TEST( prior( itr_ck.end() ) == itr_ck.begin() ); -+ BOOST_TEST( boost::next( itr_ck.begin() ) == itr_ck.end() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) ); -+ BOOST_TEST( boost::prior( itr_ck.end() ) == itr_ck.begin() ); - - itr_ck = path( "/foo" ); - BOOST_TEST( *itr_ck.begin() == std::string( "/" ) ); -- BOOST_TEST( *next( itr_ck.begin() ) == std::string( "foo" ) ); -- BOOST_TEST( next(next( itr_ck.begin() )) == itr_ck.end() ); -- BOOST_TEST( next( itr_ck.begin() ) == prior( itr_ck.end() ) ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) ); -- BOOST_TEST( *prior(prior( itr_ck.end() )) == std::string( "/" ) ); -- BOOST_TEST( prior(prior( itr_ck.end() )) == itr_ck.begin() ); -+ BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "foo" ) ); -+ BOOST_TEST( boost::next(boost::next( itr_ck.begin() )) == itr_ck.end() ); -+ BOOST_TEST( boost::next( itr_ck.begin() ) == boost::prior( itr_ck.end() ) ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) ); -+ BOOST_TEST( *boost::prior(boost::prior( itr_ck.end() )) == std::string( "/" ) ); -+ BOOST_TEST( boost::prior(boost::prior( itr_ck.end() )) == itr_ck.begin() ); - - itr_ck = "/foo/bar"; - itr = itr_ck.begin(); -@@ -1106,65 +1105,65 @@ - - itr_ck = path( "c:" ); - BOOST_TEST( *itr_ck.begin() == std::string( "c:" ) ); -- BOOST_TEST( next( itr_ck.begin() ) == itr_ck.end() ); -- BOOST_TEST( prior( itr_ck.end() ) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "c:" ) ); -+ BOOST_TEST( boost::next( itr_ck.begin() ) == itr_ck.end() ); -+ BOOST_TEST( boost::prior( itr_ck.end() ) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "c:" ) ); - - itr_ck = path( "c:/" ); - BOOST_TEST( *itr_ck.begin() == std::string( "c:" ) ); -- BOOST_TEST( *next( itr_ck.begin() ) == std::string( "/" ) ); -- BOOST_TEST( next( next( itr_ck.begin() )) == itr_ck.end() ); -- BOOST_TEST( prior( prior( itr_ck.end() )) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "/" ) ); -- BOOST_TEST( *prior( prior( itr_ck.end() )) == std::string( "c:" ) ); -+ BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "/" ) ); -+ BOOST_TEST( boost::next( boost::next( itr_ck.begin() )) == itr_ck.end() ); -+ BOOST_TEST( boost::prior( boost::prior( itr_ck.end() )) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "/" ) ); -+ BOOST_TEST( *boost::prior( boost::prior( itr_ck.end() )) == std::string( "c:" ) ); - - itr_ck = path( "c:foo" ); - BOOST_TEST( *itr_ck.begin() == std::string( "c:" ) ); -- BOOST_TEST( *next( itr_ck.begin() ) == std::string( "foo" ) ); -- BOOST_TEST( next(next( itr_ck.begin() )) == itr_ck.end() ); -- BOOST_TEST( prior(prior( itr_ck.end() )) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) ); -- BOOST_TEST( *prior(prior( itr_ck.end() )) == std::string( "c:" ) ); -+ BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "foo" ) ); -+ BOOST_TEST( boost::next(boost::next( itr_ck.begin() )) == itr_ck.end() ); -+ BOOST_TEST( boost::prior(boost::prior( itr_ck.end() )) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) ); -+ BOOST_TEST( *boost::prior(boost::prior( itr_ck.end() )) == std::string( "c:" ) ); - - itr_ck = path( "c:/foo" ); - BOOST_TEST( *itr_ck.begin() == std::string( "c:" ) ); -- BOOST_TEST( *next( itr_ck.begin() ) == std::string( "/" ) ); -- BOOST_TEST( *next( next( itr_ck.begin() )) == std::string( "foo" ) ); -- BOOST_TEST( next( next( next( itr_ck.begin() ))) == itr_ck.end() ); -- BOOST_TEST( prior( prior( prior( itr_ck.end() ))) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) ); -- BOOST_TEST( *prior( prior( itr_ck.end() )) == std::string( "/" ) ); -- BOOST_TEST( *prior( prior( prior( itr_ck.end() ))) == std::string( "c:" ) ); -+ BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "/" ) ); -+ BOOST_TEST( *boost::next( boost::next( itr_ck.begin() )) == std::string( "foo" ) ); -+ BOOST_TEST( boost::next( boost::next( boost::next( itr_ck.begin() ))) == itr_ck.end() ); -+ BOOST_TEST( boost::prior( boost::prior( boost::prior( itr_ck.end() ))) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) ); -+ BOOST_TEST( *boost::prior( boost::prior( itr_ck.end() )) == std::string( "/" ) ); -+ BOOST_TEST( *boost::prior( boost::prior( boost::prior( itr_ck.end() ))) == std::string( "c:" ) ); - - itr_ck = path( "//net" ); - BOOST_TEST( *itr_ck.begin() == std::string( "//net" ) ); -- BOOST_TEST( next( itr_ck.begin() ) == itr_ck.end() ); -- BOOST_TEST( prior( itr_ck.end() ) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "//net" ) ); -+ BOOST_TEST( boost::next( itr_ck.begin() ) == itr_ck.end() ); -+ BOOST_TEST( boost::prior( itr_ck.end() ) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "//net" ) ); - - itr_ck = path( "//net/" ); - CHECK_EQUAL( *itr_ck.begin(), "//net" ); -- CHECK_EQUAL( *next( itr_ck.begin() ), "/" ); -- BOOST_TEST( next(next( itr_ck.begin() )) == itr_ck.end() ); -- BOOST_TEST( prior(prior( itr_ck.end() )) == itr_ck.begin() ); -- CHECK_EQUAL( *prior( itr_ck.end() ), "/" ); -- CHECK_EQUAL( *prior(prior( itr_ck.end() )), "//net" ); -+ CHECK_EQUAL( *boost::next( itr_ck.begin() ), "/" ); -+ BOOST_TEST( boost::next(boost::next( itr_ck.begin() )) == itr_ck.end() ); -+ BOOST_TEST( boost::prior(boost::prior( itr_ck.end() )) == itr_ck.begin() ); -+ CHECK_EQUAL( *boost::prior( itr_ck.end() ), "/" ); -+ CHECK_EQUAL( *boost::prior(boost::prior( itr_ck.end() )), "//net" ); - - itr_ck = path( "//net/foo" ); - BOOST_TEST( *itr_ck.begin() == std::string( "//net" ) ); -- BOOST_TEST( *next( itr_ck.begin() ) == std::string( "/" ) ); -- BOOST_TEST( *next(next( itr_ck.begin() )) == std::string( "foo" ) ); -- BOOST_TEST( next(next(next( itr_ck.begin() ))) == itr_ck.end() ); -- BOOST_TEST( prior(prior(prior( itr_ck.end() ))) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) ); -- BOOST_TEST( *prior(prior( itr_ck.end() )) == std::string( "/" ) ); -- BOOST_TEST( *prior(prior(prior( itr_ck.end() ))) == std::string( "//net" ) ); -+ BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "/" ) ); -+ BOOST_TEST( *boost::next(boost::next( itr_ck.begin() )) == std::string( "foo" ) ); -+ BOOST_TEST( boost::next(boost::next(boost::next( itr_ck.begin() ))) == itr_ck.end() ); -+ BOOST_TEST( boost::prior(boost::prior(boost::prior( itr_ck.end() ))) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) ); -+ BOOST_TEST( *boost::prior(boost::prior( itr_ck.end() )) == std::string( "/" ) ); -+ BOOST_TEST( *boost::prior(boost::prior(boost::prior( itr_ck.end() ))) == std::string( "//net" ) ); - - itr_ck = path( "prn:" ); - BOOST_TEST( *itr_ck.begin() == std::string( "prn:" ) ); -- BOOST_TEST( next( itr_ck.begin() ) == itr_ck.end() ); -- BOOST_TEST( prior( itr_ck.end() ) == itr_ck.begin() ); -- BOOST_TEST( *prior( itr_ck.end() ) == std::string( "prn:" ) ); -+ BOOST_TEST( boost::next( itr_ck.begin() ) == itr_ck.end() ); -+ BOOST_TEST( boost::prior( itr_ck.end() ) == itr_ck.begin() ); -+ BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "prn:" ) ); - } // Windows - - else diff --git a/pkgs/core/boost/patches/boost-1.39.0-function_template.patch b/pkgs/core/boost/patches/boost-1.39.0-function_template.patch deleted file mode 100644 index 892134f..0000000 --- a/pkgs/core/boost/patches/boost-1.39.0-function_template.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru boost/function/function_template.hpp boost/function/function_template.hpp ---- a/boost/function/function_template.hpp 2009-05-10 10:31:29.000000000 +0100 -+++ b/boost/function/function_template.hpp 2009-05-10 10:49:46.000000000 +0100 -@@ -950,10 +950,10 @@ - f.vtable->manager(f.functor, this->functor, - boost::detail::function::move_functor_tag); - f.vtable = 0; --#if !defined(BOOST_NO_EXCEPTIONS) - } else { - clear(); - } -+#if !defined(BOOST_NO_EXCEPTIONS) - } catch (...) { - vtable = 0; - throw; diff --git a/pkgs/core/boost/patches/boost-1.39.0-unneccessary_iostreams.patch b/pkgs/core/boost/patches/boost-1.39.0-unneccessary_iostreams.patch deleted file mode 100644 index 0fd590a..0000000 --- a/pkgs/core/boost/patches/boost-1.39.0-unneccessary_iostreams.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru boost/spirit/home/classic/iterator/multi_pass.hpp boost/spirit/home/classic/iterator/multi_pass.hpp ---- a/boost/spirit/home/classic/iterator/multi_pass.hpp 2009-01-09 10:38:36.000000000 +0000 -+++ b/boost/spirit/home/classic/iterator/multi_pass.hpp 2009-01-09 10:39:41.000000000 +0000 -@@ -12,7 +12,6 @@ - #include <boost/throw_exception.hpp> - #include <deque> - #include <iterator> --#include <iostream> - #include <algorithm> // for std::swap - #include <exception> // for std::exception - #include <boost/limits.hpp> diff --git a/pkgs/core/boost/patches/boost-1.39.0-version-override.patch b/pkgs/core/boost/patches/boost-1.39.0-version-override.patch deleted file mode 100644 index 0fe654c..0000000 --- a/pkgs/core/boost/patches/boost-1.39.0-version-override.patch +++ /dev/null @@ -1,36 +0,0 @@ -*** a/Jamroot.orig 2009-05-06 12:46:31.000000000 -0700 ---- b/Jamroot 2009-05-06 18:18:17.000000000 -0700 -*************** rule tag ( name : type ? : property-set -*** 344,350 **** - else - { - local result = [ common.format-name -! <base> - -$(BUILD_ID) - : $(name) : $(type) : $(property-set) ] ; - ---- 344,350 ---- - else - { - local result = [ common.format-name -! <base> <threading> - -$(BUILD_ID) - : $(name) : $(type) : $(property-set) ] ; - -*************** rule tag ( name : type ? : property-set -*** 356,362 **** - # suffixes either. Pgi compilers can not accept library with version - # suffix. - if $(type) = SHARED_LIB && -! ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) && - ! ( [ $(property-set).get <toolset> ] in pgi ) ) - { - result = $(result).$(BOOST_VERSION) ; ---- 356,362 ---- - # suffixes either. Pgi compilers can not accept library with version - # suffix. - if $(type) = SHARED_LIB && -! ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix linux ) && - ! ( [ $(property-set).get <toolset> ] in pgi ) ) - { - result = $(result).$(BOOST_VERSION) ; diff --git a/pkgs/core/boost/patches/boost-1.41.0-iostreams-zlib.patch b/pkgs/core/boost/patches/boost-1.41.0-iostreams-zlib.patch new file mode 100644 index 0000000..09b900c --- /dev/null +++ b/pkgs/core/boost/patches/boost-1.41.0-iostreams-zlib.patch @@ -0,0 +1,21 @@ +Index: /trunk/boost/iostreams/filter/zlib.hpp +=================================================================== +--- a/boost/iostreams/filter/zlib.hpp (revision 45783) ++++ b/boost/iostreams/filter/zlib.hpp (revision 57610) +@@ -21,4 +21,5 @@ + #include <new> + #include <boost/config.hpp> // MSVC, STATIC_CONSTANT, DEDUCED_TYPENAME, DINKUM. ++#include <boost/cstdint.hpp> // uint*_t + #include <boost/detail/workaround.hpp> + #include <boost/iostreams/constants.hpp> // buffer size. +@@ -44,7 +45,7 @@ + // Typedefs + +-typedef unsigned int uint; +-typedef unsigned char byte; +-typedef unsigned long ulong; ++typedef uint32_t uint; ++typedef uint8_t byte; ++typedef uint32_t ulong; + + // Prefix 'x' prevents symbols from being redefined when Z_PREFIX is defined diff --git a/pkgs/core/boost/patches/boost-1.41.0-mapnik.patch b/pkgs/core/boost/patches/boost-1.41.0-mapnik.patch new file mode 100644 index 0000000..c7a0a18 --- /dev/null +++ b/pkgs/core/boost/patches/boost-1.41.0-mapnik.patch @@ -0,0 +1,21 @@ +diff -up /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/iostreams/device/mapped_file.hpp~ /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/iostreams/device/mapped_file.hpp +--- a/boost/iostreams/device/mapped_file.hpp~ 2009-12-17 20:51:56.000000000 +0100 ++++ b/boost/iostreams/device/mapped_file.hpp 2010-01-25 10:33:43.000000000 +0100 +@@ -4,6 +4,9 @@ + // 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.) + ++#ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED ++#define BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED ++ + #if defined(_MSC_VER) && (_MSC_VER >= 1020) + # pragma once + #endif +@@ -591,3 +594,5 @@ operator^=(mapped_file::mapmode& a, mapp + } } // End namespaces iostreams, boost. + + #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas ++ ++#endif // #ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED + +Diff finished. Mon Jan 25 10:33:55 2010 diff --git a/pkgs/core/boost/patches/boost-1.41.0-shared_ptr_serialization.patch b/pkgs/core/boost/patches/boost-1.41.0-shared_ptr_serialization.patch new file mode 100644 index 0000000..f1312b6 --- /dev/null +++ b/pkgs/core/boost/patches/boost-1.41.0-shared_ptr_serialization.patch @@ -0,0 +1,14 @@ +diff -up /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/archive/shared_ptr_helper.hpp~ /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/archive/shared_ptr_helper.hpp +--- boost-1.41.0.cmake0/boost/archive/shared_ptr_helper.hpp~ 2009-12-17 20:51:55.000000000 +0100 ++++ boost-1.41.0.cmake0/boost/archive/shared_ptr_helper.hpp 2010-02-22 14:13:18.000000000 +0100 +@@ -108,7 +108,7 @@ public: + struct non_polymorphic { + static const boost::serialization::extended_type_info * + get_object_identifier(T & t){ +- return boost::serialization::singleton< ++ return &boost::serialization::singleton< + BOOST_DEDUCED_TYPENAME + boost::serialization::type_info_implementation<T>::type + >::get_const_instance(); + +Diff finished. Mon Feb 22 14:13:38 2010 diff --git a/pkgs/core/boost/patches/boost-graph-compile.patch b/pkgs/core/boost/patches/boost-graph-compile.patch new file mode 100644 index 0000000..fe8384b --- /dev/null +++ b/pkgs/core/boost/patches/boost-graph-compile.patch @@ -0,0 +1,12 @@ +*** a/boost/graph/distributed/detail/mpi_process_group.ipp.orig 2009-12-16 15:46:32.410223363 -0800 +--- b/boost/graph/distributed/detail/mpi_process_group.ipp 2009-12-16 15:47:28.700348300 -0800 +*************** +*** 19,24 **** +--- 19,25 ---- + #endif + + #include <cassert> ++ #include <cstdio> + #include <algorithm> + #include <boost/graph/parallel/detail/untracked_pair.hpp> + #include <numeric>
hooks/post-receive -- IPFire 3.x development tree