[mingw-boost: 27/48] update to 1.47.0
epienbro
epienbro at fedoraproject.org
Wed Mar 7 15:44:53 UTC 2012
commit c71148a5f6a0aec4151a12c6bdee4dd620aca5f4
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Fri Sep 2 11:25:42 2011 +0200
update to 1.47.0
.gitignore | 1 +
boost-1.46.1-spirit.patch | 59 ---
...-full.patch => boost-1.47.0-cmakeify-full.patch | 394 +++++++++++++++++++-
boost-1.47.0-exceptions.patch | 25 ++
...erase.patch => boost-1.47.0-signals-erase.patch | 0
mingw32-boost.spec | 35 +-
sources | 2 +-
7 files changed, 431 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 921f126..c3caa0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ boost-1.41.0.cmake0.tar.bz2
/boost_1_44_0.tar.bz2
/boost_1_46_0_beta1.tar.bz2
/boost_1_46_1.tar.bz2
+/boost_1_47_0.tar.bz2
diff --git a/boost-1.46.1-cmakeify-full.patch b/boost-1.47.0-cmakeify-full.patch
similarity index 99%
rename from boost-1.46.1-cmakeify-full.patch
rename to boost-1.47.0-cmakeify-full.patch
index 6904c27..b07e8b3 100644
--- a/boost-1.46.1-cmakeify-full.patch
+++ b/boost-1.47.0-cmakeify-full.patch
@@ -2344,6 +2344,119 @@ index 0000000..9512e2e
+
+boost_test_compile(bind_unary_addr)
+
+diff --git a/libs/chrono/CMakeLists.txt b/libs/chrono/CMakeLists.txt
+new file mode 100644
+index 0000000..cf68e74
+--- /dev/null
++++ b/libs/chrono/CMakeLists.txt
+@@ -0,0 +1,28 @@
++#
++# Copyright Troy D. Straszheim
++#
++# Distributed under the Boost Software License, Version 1.0.
++# See http://www.boost.org/LICENSE_1_0.txt
++#
++#----------------------------------------------------------------------------
++# This file was automatically generated from the original CMakeLists.txt file
++# Add a variable to hold the headers for the library
++set (lib_headers
++ chrono.hpp
++ chrono
++)
++
++# Add a library target to the build system
++boost_library_project(
++ chrono
++ SRCDIRS src
++ TESTDIRS test
++ HEADERS ${lib_headers}
++ # DOCDIRS
++ DESCRIPTION "Useful time utilities."
++ MODULARIZED
++ AUTHORS "Vicente J. Botet Escribá <vicente.botet - at - wanadoo.fr>"
++ # MAINTAINERS
++)
++
++
+diff --git a/libs/chrono/module.cmake b/libs/chrono/module.cmake
+new file mode 100644
+index 0000000..f160fbd
+--- /dev/null
++++ b/libs/chrono/module.cmake
+@@ -0,0 +1 @@
++boost_module(chrono DEPENDS system)
+diff --git a/libs/chrono/src/CMakeLists.txt b/libs/chrono/src/CMakeLists.txt
+new file mode 100644
+index 0000000..b13377a
+--- /dev/null
++++ b/libs/chrono/src/CMakeLists.txt
+@@ -0,0 +1,19 @@
++#
++# Copyright Troy D. Straszheim
++#
++# Distributed under the Boost Software License, Version 1.0.
++# See http://www.boost.org/LICENSE_1_0.txt
++#
++set(BOOST_CHRONO_EXTRA_SOURCES)
++set(BOOST_CHRONO_LIBRARIES)
++
++boost_add_library(chrono
++ chrono.cpp
++ process_clock.cpp
++ process_cpu_clocks.cpp
++ run_timer.cpp
++ run_timer_static.cpp
++ thread_clock.cpp
++
++ SHARED_COMPILE_FLAGS "-DBOOST_CHRONO_DYN_LINK=1"
++ )
+diff --git a/libs/chrono/test/CMakeLists.txt b/libs/chrono/test/CMakeLists.txt
+new file mode 100644
+index 0000000..d254e93
+--- /dev/null
++++ b/libs/chrono/test/CMakeLists.txt
+@@ -0,0 +1,41 @@
++#
++# Copyright Troy D. Straszheim
++#
++# Distributed under the Boost Software License, Version 1.0.
++# See http://www.boost.org/LICENSE_1_0.txt
++#
++boost_additional_test_dependencies(chrono BOOST_DEPENDS test)
++
++set(CHRONO_LIBRARIES
++ boost_chrono
++ boost_test_exec_monitor)
++
++set(BOOST_TEST_EXEC_MONITOR_SUFFIX "")
++if (NOT BUILD_SINGLE_THREADED)
++ set(BOOST_TEST_EXEC_MONITOR_SUFFIX "-mt")
++endif()
++set(BOOST_TEST_EXEC_MONITOR_SUFFIX "${BOOST_TEST_EXEC_MONITOR_SUFFIX}-static")
++if (NOT BUILD_RELEASE)
++ set(BOOST_TEST_EXEC_MONITOR_SUFFIX "${BOOST_TEST_EXEC_MONITOR_SUFFIX}-debug")
++endif()
++
++macro(chrono_test_run TESTNAME)
++ boost_test_run(${TESTNAME}
++ STATIC
++ DEPENDS boost_chrono boost_test_exec_monitor )
++ boost_test_run("${TESTNAME}_dll"
++ ${TESTNAME}.cpp
++ SHARED
++ DEPENDS boost_chrono
++ "boost_test_exec_monitor${BOOST_TEST_EXEC_MONITOR_SUFFIX}")
++endmacro(chrono_test_run)
++
++#
++set(TESTS
++clock
++duration
++time_point
++traits)
++
++#
++chrono_test_run(run_timer_test)
diff --git a/libs/circular_buffer/CMakeLists.txt b/libs/circular_buffer/CMakeLists.txt
new file mode 100644
index 0000000..cb2fa50c0
@@ -4039,6 +4152,102 @@ index 0000000..fa210eb
@@ -0,0 +1 @@
+boost_module (fusion DEPENDS function_types)
\ No newline at end of file
+diff --git a/libs/geometry/CMakeLists.txt b/libs/geometry/CMakeLists.txt
+new file mode 100644
+index 0000000..385a4c6
+--- /dev/null
++++ b/libs/geometry/CMakeLists.txt
+@@ -0,0 +1,23 @@
++#----------------------------------------------------------------------------
++# This file was automatically generated from the original CMakeLists.txt file
++# Add a variable to hold the headers for the library
++set (lib_headers
++ geometry
++)
++
++# Add a library target to the build system
++boost_library_project(
++ geometry
++ TESTDIRS test
++ EXAMPLEDIRS example
++ HEADERS ${lib_headers}
++ DOCDIRS doc
++ DESCRIPTION "Geometry Library."
++ MODULARIZED
++ AUTHORS "Barend Gehrels <barend - at - xs4all.nl>"
++ "Bruno Lalande <bruno.lalande - at - gmail.com>"
++ "Mateusz Loskot <mateusz - at - loskot.net>"
++ # MAINTAINERS
++)
++
++
+diff --git a/libs/geometry/module.cmake b/libs/geometry/module.cmake
+new file mode 100644
+index 0000000..523adeb
+--- /dev/null
++++ b/libs/geometry/module.cmake
+@@ -0,0 +1 @@
++boost_module(geometry DEPENDS parameter typeof foreach)
+\ No newline at end of file
+diff --git a/libs/geometry/test/CMakeLists.txt b/libs/geometry/test/CMakeLists.txt
+new file mode 100644
+index 0000000..fe1a3ce
+--- /dev/null
++++ b/libs/geometry/test/CMakeLists.txt
+@@ -0,0 +1,52 @@
++# (C) Copyright 2005: Eric Niebler
++# 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)
++
++# bring in rules for testing
++#import testing ;
++#import feature ;
++
++#feature.feature iterator_debugging
++# : on off
++# : composite propagated optional
++# ;
++
++#feature.compose <iterator_debugging>off
++# : <define>_HAS_ITERATOR_DEBUGGING=0
++# ;
++
++# project
++# : requirements
++# <library>/boost/test//boost_unit_test_framework
++# <link>static
++# <include>../../..
++# <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
++# # MSVC's iterator debugging causes some tests to run forever.
++# <toolset>msvc:<iterator_debugging>off
++# <toolset>intel-win:<iterator_debugging>off
++# ;
++
++boost_additional_test_dependencies(geometry BOOST_DEPENDS test)
++
++
++set(TESTS
++core
++point_concept
++geometries
++arithmetic
++algorithms
++iterators
++strategies
++policies
++util
++views
++multi
++domains)
++
++foreach(TEST ${TESTS})
++ boost_test_run(${TEST} DEPENDS boost_unit_test_framework)
++endforeach(TEST ${TESTS})
++
++if(WIN32)
++ message("Need to turn on iterator debugging")
++endif(WIN32)
+\ No newline at end of file
diff --git a/libs/gil/CMakeLists.txt b/libs/gil/CMakeLists.txt
new file mode 100644
index 0000000..3b2f11d
@@ -6468,6 +6677,111 @@ index 0000000..b11e21b
+
+endif()
\ No newline at end of file
+diff --git a/libs/phoenix/CMakeLists.txt b/libs/phoenix/CMakeLists.txt
+new file mode 100644
+index 0000000..707857b
+--- /dev/null
++++ b/libs/phoenix/CMakeLists.txt
+@@ -0,0 +1,29 @@
++#
++# Copyright Troy D. Straszheim
++#
++# Distributed under the Boost Software License, Version 1.0.
++# See http://www.boost.org/LICENSE_1_0.txt
++#
++#----------------------------------------------------------------------------
++# This file was automatically generated from the original CMakeLists.txt file
++# Add a variable to hold the headers for the library
++set (lib_headers
++ phoenix
++)
++
++# Add a library target to the build system
++boost_library_project(
++ phoenix
++ # SRCDIRS
++ TESTDIRS test
++ HEADERS ${lib_headers}
++ DOCDIRS doc
++ DESCRIPTION "Define small unnamed function objects at the actual call site, and more."
++ MODULARIZED
++ AUTHORS "Joel de Guzman <joel -at- boost-consulting.com>"
++ "Dan Marsden"
++ "Thomas Heller"
++ # MAINTAINERS
++)
++
++
+diff --git a/libs/phoenix/module.cmake b/libs/phoenix/module.cmake
+new file mode 100644
+index 0000000..c971b0a
+--- /dev/null
++++ b/libs/phoenix/module.cmake
+@@ -0,0 +1,2 @@
++boost_module(phoenix DEPENDS fusion typeof)
++
+diff --git a/libs/phoenix/test/CMakeLists.txt b/libs/phoenix/test/CMakeLists.txt
+new file mode 100644
+index 0000000..679bbc0
+--- /dev/null
++++ b/libs/phoenix/test/CMakeLists.txt
+@@ -0,0 +1,56 @@
++#
++# Copyright Troy D. Straszheim
++#
++# Distributed under the Boost Software License, Version 1.0.
++# See http://www.boost.org/LICENSE_1_0.txt
++#
++boost_additional_test_dependencies(phoenix BOOST_DEPENDS test)
++
++################################################################################
++#--- Compiler specific settings
++
++# GCC
++IF(CMAKE_COMPILER_IS_GNUCC)
++ SET(test_compile_flags "-ftemplate-depth-1024")
++ENDIF(CMAKE_COMPILER_IS_GNUCC)
++
++# Microsoft Visual Studio
++IF (MSVC71)
++ #TODO// Turn off debug symbols?
++ENDIF(MSVC71)
++IF (MSVC80)
++ SET(test_compile_flags "-D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE")
++ENDIF(MSVC80)
++IF (MSVC90)
++ SET(test_compile_flags "-D_SCL_SECURE_NO_DEPRECATE")
++ENDIF (MSVC90)
++
++# Intel
++IF( ${CMAKE_CXX_COMPILER} MATCHES "icpc" )
++ #TODO// Turn off debug symbols?
++ENDIF( ${CMAKE_CXX_COMPILER} MATCHES "icpc" )
++
++set(TESTS
++algorithm
++bll_compatibility
++bind
++boost_bind_compatibility
++container
++core
++function
++include
++object
++operator
++regression
++scope
++statement
++stdlib)
++
++foreach(TEST ${TESTS})
++ boost_test_run(${TEST} DEPENDS boost_unit_test_framework)
++endforeach(TEST ${TESTS})
++
++if(WIN32)
++ message("Need to turn on iterator debugging")
++endif(WIN32)
++
diff --git a/libs/polygon/CMakeLists.txt b/libs/polygon/CMakeLists.txt
new file mode 100644
index 0000000..ce3b9da
@@ -6891,7 +7205,7 @@ index 0000000..d94092d
+ DEPENDS boost_serialization SHARED)
diff --git a/libs/proto/CMakeLists.txt b/libs/proto/CMakeLists.txt
new file mode 100644
-index 0000000..36d5060
+index 0000000..dc61c1a
--- /dev/null
+++ b/libs/proto/CMakeLists.txt
@@ -0,0 +1,27 @@
@@ -6915,9 +7229,9 @@ index 0000000..36d5060
+ TESTDIRS test
+ HEADERS ${lib_headers}
+ DOCDIRS doc
-+ # DESCRIPTION "Helps Boost library developers adapt to compiler idiosyncrasies; not intended for library users."
++ DESCRIPTION "Expression template library and compiler construction toolkit for domain-specific embedded languages."
+ MODULARIZED
-+ # AUTHORS "John Maddock <john -at- johnmaddock.co.uk>"
++ AUTHORS "Eric Niebler <eric -at- boost-consulting.com>"
+ # MAINTAINERS
+)
+
@@ -7641,6 +7955,74 @@ index 0000000..0907adc
+boost_test_run(reversible_range DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
+boost_test_run(const_ranges DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
+boost_test_run(extension_mechanism DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
+diff --git a/libs/ratio/CMakeLists.txt b/libs/ratio/CMakeLists.txt
+new file mode 100644
+index 0000000..e72ac71
+--- /dev/null
++++ b/libs/ratio/CMakeLists.txt
+@@ -0,0 +1,21 @@
++#----------------------------------------------------------------------------
++# This file was automatically generated from the original CMakeLists.txt file
++# Add a variable to hold the headers for the library
++set (lib_headers
++ ratio
++)
++
++# Add a library target to the build system
++boost_library_project(
++ ratio
++ TESTDIRS test
++ EXAMPLEDIRS example
++ HEADERS ${lib_headers}
++ DOCDIRS doc
++ DESCRIPTION "Compile time rational arithmetic."
++ MODULARIZED
++ AUTHORS "Vicente J. Botet Escribá <vicente.botet - at - wanadoo.fr>"
++ # MAINTAINERS
++)
++
++
+diff --git a/libs/ratio/module.cmake b/libs/ratio/module.cmake
+new file mode 100644
+index 0000000..4448f13
+--- /dev/null
++++ b/libs/ratio/module.cmake
+@@ -0,0 +1 @@
++boost_module(ratio DEPENDS parameter typeof foreach)
+\ No newline at end of file
+diff --git a/libs/ratio/test/CMakeLists.txt b/libs/ratio/test/CMakeLists.txt
+new file mode 100644
+index 0000000..2efdaf1
+--- /dev/null
++++ b/libs/ratio/test/CMakeLists.txt
+@@ -0,0 +1,27 @@
++#
++# Copyright Troy D. Straszheim
++#
++# Distributed under the Boost Software License, Version 1.0.
++# See http://www.boost.org/LICENSE_1_0.txt
++#
++boost_additional_test_dependencies(ratio BOOST_DEPENDS test)
++
++#
++set(TESTS
++ratio_arithmetic
++ratio_comparison
++ratio_extensions
++ratio_io
++ratio_ratio)
++
++foreach(TEST ${TESTS})
++ boost_test_run(${TEST} DEPENDS boost_unit_test_framework)
++endforeach(TEST ${TESTS})
++
++if(WIN32)
++ message("Need to turn on iterator debugging")
++endif(WIN32)
++
++#
++ratio_test_run(ratio_test)
++ratio_test_run(typedefs_pass)
diff --git a/libs/rational/CMakeLists.txt b/libs/rational/CMakeLists.txt
new file mode 100644
index 0000000..53c440d
@@ -37762,9 +38144,6 @@ index 0000000..594a34d
+)
+
+
-diff --git a/tools/build/CMake/test/libs/c/module.cmake b/tools/build/CMake/test/libs/c/module.cmake
-new file mode 100644
-index 0000000..e69de29
diff --git a/tools/build/CMake/test/libs/c/src/CMakeLists.txt b/tools/build/CMake/test/libs/c/src/CMakeLists.txt
new file mode 100644
index 0000000..cfc4752
@@ -37907,9 +38286,6 @@ index 0000000..5cff225
+)
+
+
-diff --git a/tools/build/CMake/test/libs/d/module.cmake b/tools/build/CMake/test/libs/d/module.cmake
-new file mode 100644
-index 0000000..e69de29
diff --git a/tools/build/CMake/test/libs/d/src/CMakeLists.txt b/tools/build/CMake/test/libs/d/src/CMakeLists.txt
new file mode 100644
index 0000000..aaba81f
diff --git a/boost-1.47.0-exceptions.patch b/boost-1.47.0-exceptions.patch
new file mode 100644
index 0000000..9faa715
--- /dev/null
+++ b/boost-1.47.0-exceptions.patch
@@ -0,0 +1,25 @@
+diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp
+--- boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200
++++ boost/numeric/conversion/converter_policies.hpp 2011-07-22 11:46:40.961876274 +0200
+@@ -20,6 +20,7 @@
+
+ #include "boost/mpl/if.hpp"
+ #include "boost/mpl/integral_c.hpp"
++#include "boost/throw_exception.hpp"
+
+ namespace boost { namespace numeric
+ {
+@@ -159,9 +160,9 @@ struct def_overflow_handler
+ void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow)
+ {
+ if ( r == cNegOverflow )
+- throw negative_overflow() ;
++ boost::throw_exception( negative_overflow() ) ;
+ else if ( r == cPosOverflow )
+- throw positive_overflow() ;
++ boost::throw_exception( positive_overflow() ) ;
+ }
+ } ;
+
+
+Diff finished. Fri Jul 22 11:46:49 2011
diff --git a/boost-1.46.1-signals-erase.patch b/boost-1.47.0-signals-erase.patch
similarity index 100%
rename from boost-1.46.1-signals-erase.patch
rename to boost-1.47.0-signals-erase.patch
diff --git a/mingw32-boost.spec b/mingw32-boost.spec
index 468929e..29e51d7 100644
--- a/mingw32-boost.spec
+++ b/mingw32-boost.spec
@@ -8,11 +8,11 @@
%global name1 boost
Name: mingw32-%{name1}
-Version: 1.46.1
-%global version_enc 1_46_1
-%global dllboostver 1_46_1
+Version: 1.47.0
+%global version_enc 1_47_0
+%global dllboostver 1_47_0
%global dllgccver gcc46
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: MinGW Windows port of Boost C++ Libraries
License: Boost
@@ -30,19 +30,18 @@ Group: Development/Libraries
URL: http://www.boost.org
Source: http://downloads.sourceforge.net/%{name1}/%{toplev_dirname}.tar.bz2
-# CMake-related files (CMakeLists.txt and module.cmake files)
-Patch0: boost-1.46.1-cmakeify-full.patch
-
-Patch2: boost-cmake-soname.patch
+# CMake-related files (CMakeLists.txt and module.cmake files).
+# That patch also contains Web-related documentation for the Trac Wiki
+# devoted to "old" Boost-CMake (up-to-date until Boost-1.41.0).
+Patch0: boost-1.47.0-cmakeify-full.patch
+Patch1: boost-cmake-soname.patch
# The patch may break c++03, and there is therefore no plan yet to include
# it upstream: https://svn.boost.org/trac/boost/ticket/4999
-Patch3: boost-1.46.1-signals-erase.patch
+Patch2: boost-1.47.0-signals-erase.patch
-# http://comments.gmane.org/gmane.comp.lib.boost.devel/214323
-# Has been fixed on Boost trunk (will be fixed in Boost-1.47:
-# https://svn.boost.org/trac/boost/changeset/68725)
-Patch5: boost-1.46.1-spirit.patch
+# https://svn.boost.org/trac/boost/ticket/5731
+Patch3: boost-1.47.0-exceptions.patch
BuildArch: noarch
@@ -57,6 +56,7 @@ BuildRequires: mingw32-zlib
BuildRequires: mingw32-expat
BuildRequires: mingw32-pthreads
BuildRequires: perl
+BuildRequires: chrpath
# These are required by the native package:
#BuildRequires: mingw32-python
#BuildRequires: mingw32-libicu
@@ -87,11 +87,11 @@ Static version of the MinGW Windows Boost C++ library.
# CMake framework (CMakeLists.txt, *.cmake and documentation files)
%patch0 -p1
-sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH2} | %{__patch} -p0 --fuzz=0
+sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH1} | %{__patch} -p0 --fuzz=0
# fixes
-%patch3 -p1
-%patch5 -p0
+%patch2 -p1
+%patch3 -p0
%build
# Support for building tests.
@@ -309,6 +309,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Sep 2 2011 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.47.0-1
+- update to 1.47.0
+
* Tue Jun 28 2011 Kalev Lember <kalev at smartlink.ee> - 1.46.1-2
- Rebuilt for mingw32-gcc 4.6
diff --git a/sources b/sources
index b01f081..46a422f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7375679575f4c8db605d426fc721d506 boost_1_46_1.tar.bz2
+a2dc343f7bc7f83f8941e47ed4a18200 boost_1_47_0.tar.bz2
More information about the scm-commits
mailing list