Djam/boost
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/boost.git synced 2025-04-20 05:04:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 1.48.0

Browse source
This commit is contained in:
Rosa 2012-02-01 18:20:14 +04:00
parent 2e077c4534
commit c9f95d9f65
6 changed files with 794 additions and 170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources: sources:
"boost_1_46_1.tar.bz2": 3ca6e173ec805e5126868d8a03618e587aa26aef "boost_1_48_0.tar.bz2": 27aced5086e96c6f7b2b684bda2bd515e115da35

59
boost-1.46.0-spirit.patch
View file

@ -1,59 +0,0 @@
Index: boost/boost/spirit/home/qi/nonterminal/detail/parameterized.hpp
===================================================================
--- boost/boost/spirit/home/qi/nonterminal/detail/parameterized.hpp (revision 68724)
+++ boost/boost/spirit/home/qi/nonterminal/detail/parameterized.hpp (revision 68725)
@@ -14,6 +14,7 @@
#include <boost/ref.hpp>
+#include <boost/spirit/home/support/handles_container.hpp>
#include <boost/spirit/home/qi/parser.hpp>
namespace boost { namespace spirit { namespace qi
@@ -59,4 +60,16 @@ namespace boost { namespace spirit { nam
};
}}}
+namespace boost { namespace spirit { namespace traits
+{
+ ///////////////////////////////////////////////////////////////////////////
+ template <typename Subject, typename Params, typename Attribute
+ , typename Context, typename Iterator>
+ struct handles_container<qi::parameterized_nonterminal<Subject, Params>
+ , Attribute, Context, Iterator>
+ : handles_container<typename remove_const<Subject>::type
+ , Attribute, Context, Iterator>
+ {};
+}}}
+
#endif
Index: boost/boost/spirit/home/karma/nonterminal/detail/parameterized.hpp
===================================================================
--- boost/boost/spirit/home/karma/nonterminal/detail/parameterized.hpp (revision 68724)
+++ boost/boost/spirit/home/karma/nonterminal/detail/parameterized.hpp (revision 68725)
@@ -14,6 +14,7 @@
#include <boost/ref.hpp>
+#include <boost/spirit/home/support/handles_container.hpp>
#include <boost/spirit/home/karma/generator.hpp>
namespace boost { namespace spirit { namespace karma
@@ -60,4 +61,17 @@ namespace boost { namespace spirit { nam
};
}}}
+
+namespace boost { namespace spirit { namespace traits
+{
+ ///////////////////////////////////////////////////////////////////////////
+ template <typename Subject, typename Params, typename Attribute
+ , typename Context, typename Iterator>
+ struct handles_container<karma::parameterized_nonterminal<Subject, Params>
+ , Attribute, Context, Iterator>
+ : handles_container<typename remove_const<Subject>::type
+ , Attribute, Context, Iterator>
+ {};
+}}}
+
#endif

25
boost-1.47.0-exceptions.patch Normal file
View file

@ -0,0 +1,25 @@
diff -up boost_1_47_0/boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp
--- boost_1_47_0/boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200
+++ boost_1_47_0/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

736
boost-1.46.1-cmakeify-full.patch → boost-1.48.0-cmakeify-full.patch
View file

@ -2344,6 +2344,110 @@ index 0000000..9512e2e
+ +
+boost_test_compile(bind_unary_addr) +boost_test_compile(bind_unary_addr)
+ +
diff --git a/libs/chrono/CMakeLists.txt b/libs/chrono/CMakeLists.txt
new file mode 100644
index 0000000..1ebc520
--- /dev/null
+++ b/libs/chrono/CMakeLists.txt
@@ -0,0 +1,24 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+#
+# 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..e94dfbb
--- /dev/null
+++ b/libs/chrono/src/CMakeLists.txt
@@ -0,0 +1,14 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+#
+set (BOOST_CHRONO_EXTRA_SOURCES)
+set (BOOST_CHRONO_LIBRARIES)
+
+boost_add_library (chrono
+ chrono.cpp
+ process_cpu_clocks.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..455a63e
--- /dev/null
+++ b/libs/chrono/test/CMakeLists.txt
@@ -0,0 +1,41 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+#
+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 (NOT BUILD_SINGLE_THREADED)
+
+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 (NOT BUILD_RELEASE)
+
+#
+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 diff --git a/libs/circular_buffer/CMakeLists.txt b/libs/circular_buffer/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..cb2fa50c0 index 0000000..cb2fa50c0
@ -2589,6 +2693,71 @@ index 0000000..1e31993
+boost_test_compile_fail(test_thread_fail1 threads/test_thread_fail1.cpp) +boost_test_compile_fail(test_thread_fail1 threads/test_thread_fail1.cpp)
+boost_test_compile_fail(test_thread_fail2 threads/test_thread_fail2.cpp) +boost_test_compile_fail(test_thread_fail2 threads/test_thread_fail2.cpp)
\ No newline at end of file \ No newline at end of file
diff --git a/libs/container/CMakeLists.txt b/libs/container/CMakeLists.txt
new file mode 100644
index 0000000..6fa7745
--- /dev/null
+++ b/libs/container/CMakeLists.txt
@@ -0,0 +1,21 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+# Add a variable to hold the headers for the library
+set (lib_headers
+ container
+)
+
+# Add a library target to the build system
+boost_library_project (container
+ TESTDIRS test
+ EXAMPLEDIRS example
+ HEADERS ${lib_headers}
+ DOCDIRS doc
+ DESCRIPTION "Standard library containers and extensions."
+ MODULARIZED
+ AUTHORS "Ion Gaztañaga <igaztanaga - at - gmail.com>"
+ # MAINTAINERS
+)
+
+
diff --git a/libs/container/module.cmake b/libs/container/module.cmake
new file mode 100644
index 0000000..07f4053
--- /dev/null
+++ b/libs/container/module.cmake
@@ -0,0 +1 @@
+boost_module (container)
\ No newline at end of file
diff --git a/libs/container/test/CMakeLists.txt b/libs/container/test/CMakeLists.txt
new file mode 100644
index 0000000..64a0e79
--- /dev/null
+++ b/libs/container/test/CMakeLists.txt
@@ -0,0 +1,24 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+#
+boost_additional_test_dependencies (container BOOST_DEPENDS test)
+
+#
+set (TESTS
+ deque_test
+ flat_tree_test
+ list_test
+ slist_test
+ stable_vector_test
+ string_test
+ tree_test
+ vector_test)
+
+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/conversion/CMakeLists.txt b/libs/conversion/CMakeLists.txt diff --git a/libs/conversion/CMakeLists.txt b/libs/conversion/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..3badd19 index 0000000..3badd19
@ -2750,20 +2919,21 @@ index 0000000..536947d
\ No newline at end of file \ No newline at end of file
diff --git a/libs/date_time/src/CMakeLists.txt b/libs/date_time/src/CMakeLists.txt diff --git a/libs/date_time/src/CMakeLists.txt b/libs/date_time/src/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..3a07ef4 index 0000000..b9137bb
--- /dev/null --- /dev/null
+++ b/libs/date_time/src/CMakeLists.txt +++ b/libs/date_time/src/CMakeLists.txt
@@ -0,0 +1,13 @@ @@ -0,0 +1,14 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+# +#
+# Copyright Troy D. Straszheim +add_definitions (-DBOOST_DATE_TIME_DYN_LINK=1 -DDATE_TIME_INLINE)
+# +boost_add_library (
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
+add_definitions(-DBOOST_DATE_TIME_NO_LIB=1)
+boost_add_library(
+ date_time + date_time
+ gregorian/greg_month.cpp gregorian/greg_weekday.cpp gregorian/date_generators.cpp + gregorian/greg_month.cpp
+ gregorian/greg_weekday.cpp
+ gregorian/date_generators.cpp
+
+ STATIC_COMPILE_FLAGS -DBOOST_DATE_TIME_STATIC_LINK + STATIC_COMPILE_FLAGS -DBOOST_DATE_TIME_STATIC_LINK
+ SHARED_COMPILE_FLAGS -DBOOST_ALL_DYN_LINK=1 + SHARED_COMPILE_FLAGS -DBOOST_ALL_DYN_LINK=1
+ ) + )
@ -4039,6 +4209,79 @@ index 0000000..fa210eb
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+boost_module (fusion DEPENDS function_types) +boost_module (fusion DEPENDS function_types)
\ No newline at end of file \ No newline at end of file
diff --git a/libs/geometry/CMakeLists.txt b/libs/geometry/CMakeLists.txt
new file mode 100644
index 0000000..65fd8ce
--- /dev/null
+++ b/libs/geometry/CMakeLists.txt
@@ -0,0 +1,25 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+#
+# 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..5353515
--- /dev/null
+++ b/libs/geometry/test/CMakeLists.txt
@@ -0,0 +1,28 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+#
+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)
diff --git a/libs/gil/CMakeLists.txt b/libs/gil/CMakeLists.txt diff --git a/libs/gil/CMakeLists.txt b/libs/gil/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..3b2f11d index 0000000..3b2f11d
@ -5247,6 +5490,153 @@ index 0000000..4f9a74f
+boost_test_run(operator_tests_simple DEPENDS boost_test_exec_monitor) +boost_test_run(operator_tests_simple DEPENDS boost_test_exec_monitor)
+boost_test_run(phoenix_control_structures DEPENDS boost_test_exec_monitor) +boost_test_run(phoenix_control_structures DEPENDS boost_test_exec_monitor)
+boost_test_run(switch_construct DEPENDS boost_test_exec_monitor) +boost_test_run(switch_construct DEPENDS boost_test_exec_monitor)
diff --git a/libs/locale/CMakeLists.txt b/libs/locale/CMakeLists.txt
new file mode 100644
index 0000000..be3b625
--- /dev/null
+++ b/libs/locale/CMakeLists.txt
@@ -0,0 +1,24 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+#
+# Add a variable to hold the headers for the library
+set (lib_headers
+ locale.hpp
+ locale
+)
+
+# Add a library target to the build system
+boost_library_project (
+ locale
+ SRCDIRS src
+ TESTDIRS test
+ HEADERS ${lib_headers}
+ # DOCDIRS
+ DESCRIPTION "Provide localization and Unicode handling tools for C++."
+ MODULARIZED
+ AUTHORS "Vicente J. Botet Escribá <vicente.botet - at - wanadoo.fr>"
+ # MAINTAINERS
+)
+
+
diff --git a/libs/locale/module.cmake b/libs/locale/module.cmake
new file mode 100644
index 0000000..16740be
--- /dev/null
+++ b/libs/locale/module.cmake
@@ -0,0 +1 @@
+boost_module (locale DEPENDS thread)
diff --git a/libs/locale/src/CMakeLists.txt b/libs/locale/src/CMakeLists.txt
new file mode 100644
index 0000000..e9b5e9b
--- /dev/null
+++ b/libs/locale/src/CMakeLists.txt
@@ -0,0 +1,38 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+#
+set (BOOST_LOCALE_ICU_LIBRARIES)
+
+if (ICU_FOUND AND ICU_I18N_FOUND)
+ add_definitions (-DBOOST_HAS_ICU=1 -DBOOST_LOCALE_WITH_ICU=1)
+ include_directories (${ICU_INCLUDE_DIRS})
+ set (BOOST_LOCALE_ICU_LIBRARIES ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
+ colormsg (GREEN "+-- ICU (unicode) available for locale, enabling support.")
+ set (NO_STATIC_IF_ICU_FOUND "NO_STATIC")
+else (ICU_FOUND AND ICU_I18N_FOUND)
+ colormsg (CYAN "+-- ICU (unicode) not available for locale, disabling support.")
+endif (ICU_FOUND AND ICU_I18N_FOUND)
+
+
+add_definitions (-DBOOST_THREAD_NO_LIB=1)
+boost_add_library (
+ locale
+ encoding/codepage.cpp
+ shared/date_time.cpp
+ shared/format.cpp
+ shared/formatting.cpp
+ shared/generator.cpp
+ shared/ids.cpp
+ shared/localization_backend.cpp
+ shared/message.cpp
+ shared/mo_lambda.cpp
+ util/codecvt_converter.cpp
+ util/default_locale.cpp
+ util/info.cpp
+ util/locale_data.cpp
+
+ LINK_LIBS ${BOOST_LOCALE_ICU_LIBRARIES}
+ SHARED_COMPILE_FLAGS -DBOOST_LOCALE_DYN_LINK=1
+ ${NO_STATIC_IF_ICU_FOUND}
+ )
diff --git a/libs/locale/test/CMakeLists.txt b/libs/locale/test/CMakeLists.txt
new file mode 100644
index 0000000..11d5c0a
--- /dev/null
+++ b/libs/locale/test/CMakeLists.txt
@@ -0,0 +1,60 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+#
+boost_additional_test_dependencies (locale BOOST_DEPENDS test)
+
+set (LOCALE_LIBRARIES
+ boost_locale
+ boost_test_exec_monitor)
+
+set (BOOST_TEST_EXEC_MONITOR_SUFFIX "")
+if (NOT BUILD_SINGLE_THREADED)
+ set (BOOST_TEST_EXEC_MONITOR_SUFFIX "-mt")
+endif (NOT BUILD_SINGLE_THREADED)
+
+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 (NOT BUILD_RELEASE)
+
+#
+macro (locale_test_run TESTNAME)
+ boost_test_run (${TESTNAME}
+ STATIC
+ DEPENDS boost_locale boost_test_exec_monitor )
+ boost_test_run ("${TESTNAME}_dll"
+ ${TESTNAME}.cpp
+ SHARED
+ DEPENDS boost_locale
+ "boost_test_exec_monitor${BOOST_TEST_EXEC_MONITOR_SUFFIX}")
+endmacro (locale_test_run)
+
+#
+set (TESTS
+ test_config.cpp
+ test_utf.cpp
+ test_date_time.cpp
+ test_ios_prop.cpp
+ test_codepage_converter.cpp
+ test_codepage.cpp
+ test_message.cpp
+ test_generator.cpp
+ test_collate.cpp
+ test_convert.cpp
+ test_boundary.cpp
+ test_formatting.cpp
+ test_icu_vs_os_timezone.cpp
+ test_winapi_collate.cpp
+ test_winapi_convert.cpp
+ test_winapi_formatting.cpp
+ test_posix_collate.cpp
+ test_posix_convert.cpp
+ test_posix_formatting.cpp
+ test_std_collate.cpp
+ test_std_convert.cpp
+ test_std_formatting.cpp
+ )
+
+#
+locale_test_(run_timer_test)
diff --git a/libs/logic/CMakeLists.txt b/libs/logic/CMakeLists.txt diff --git a/libs/logic/CMakeLists.txt b/libs/logic/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..da915e5 index 0000000..da915e5
@ -5388,6 +5778,72 @@ index 0000000..88f26b7
+ boost_test_run(${mathtest} DEPENDS boost_test_exec_monitor) + boost_test_run(${mathtest} DEPENDS boost_test_exec_monitor)
+endforeach() +endforeach()
+ +
diff --git a/libs/move/CMakeLists.txt b/libs/move/CMakeLists.txt
new file mode 100644
index 0000000..33853af
--- /dev/null
+++ b/libs/move/CMakeLists.txt
@@ -0,0 +1,22 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+#
+# Add a variable to hold the headers for the library
+set (lib_headers
+ move
+)
+
+# Add a library target to the build system
+boost_library_project (move
+ TESTDIRS test
+ EXAMPLEDIRS example
+ HEADERS ${lib_headers}
+ DOCDIRS doc
+ DESCRIPTION "Portable move semantics for C++03 and C++11 compilers."
+ MODULARIZED
+ AUTHORS "Ion Gaztañaga <igaztanaga - at - gmail.com>"
+ # MAINTAINERS
+)
+
+
diff --git a/libs/move/module.cmake b/libs/move/module.cmake
new file mode 100644
index 0000000..2be0f4c
--- /dev/null
+++ b/libs/move/module.cmake
@@ -0,0 +1 @@
+boost_module (move)
\ No newline at end of file
diff --git a/libs/move/test/CMakeLists.txt b/libs/move/test/CMakeLists.txt
new file mode 100644
index 0000000..2415cf7
--- /dev/null
+++ b/libs/move/test/CMakeLists.txt
@@ -0,0 +1,24 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+#
+boost_additional_test_dependencies (move BOOST_DEPENDS test)
+
+#
+set (TESTS
+ doc_clone_ptr
+ doc_construct_forward
+ doc_file_descriptor
+ doc_how_works
+ doc_move_algorithms
+ doc_move_inserter
+ doc_move_iterator
+)
+
+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/mpi/CMakeLists.txt b/libs/mpi/CMakeLists.txt diff --git a/libs/mpi/CMakeLists.txt b/libs/mpi/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..21e408e index 0000000..21e408e
@ -6468,6 +6924,111 @@ index 0000000..b11e21b
+ +
+endif() +endif()
\ No newline at end of file \ 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 diff --git a/libs/polygon/CMakeLists.txt b/libs/polygon/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..ce3b9da index 0000000..ce3b9da
@ -6891,7 +7452,7 @@ index 0000000..d94092d
+ DEPENDS boost_serialization SHARED) + DEPENDS boost_serialization SHARED)
diff --git a/libs/proto/CMakeLists.txt b/libs/proto/CMakeLists.txt diff --git a/libs/proto/CMakeLists.txt b/libs/proto/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..36d5060 index 0000000..dc61c1a
--- /dev/null --- /dev/null
+++ b/libs/proto/CMakeLists.txt +++ b/libs/proto/CMakeLists.txt
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -6915,9 +7476,9 @@ index 0000000..36d5060
+ TESTDIRS test + TESTDIRS test
+ HEADERS ${lib_headers} + HEADERS ${lib_headers}
+ DOCDIRS doc + 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 + MODULARIZED
+ # AUTHORS "John Maddock <john -at- johnmaddock.co.uk>" + AUTHORS "Eric Niebler <eric -at- boost-consulting.com>"
+ # MAINTAINERS + # MAINTAINERS
+) +)
+ +
@ -7641,6 +8202,74 @@ index 0000000..0907adc
+boost_test_run(reversible_range DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags}) +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(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}) +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 diff --git a/libs/rational/CMakeLists.txt b/libs/rational/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..53c440d index 0000000..53c440d
@ -7852,35 +8481,28 @@ index 0000000..3c9c0ae
\ No newline at end of file \ No newline at end of file
diff --git a/libs/regex/src/CMakeLists.txt b/libs/regex/src/CMakeLists.txt diff --git a/libs/regex/src/CMakeLists.txt b/libs/regex/src/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..12bf067 index 0000000..c92f266
--- /dev/null --- /dev/null
+++ b/libs/regex/src/CMakeLists.txt +++ b/libs/regex/src/CMakeLists.txt
@@ -0,0 +1,51 @@ @@ -0,0 +1,44 @@
+#----------------------------------------------------------------------------
+# CMake framework maintained by Denis Arnaud on git@github.com:pocb/boost
+#----------------------------------------------------------------------------
+# +#
+# Copyright Troy D. Straszheim +set (BOOST_REGEX_ICU_LIBRARIES)
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
+
+set(BOOST_REGEX_ICU_LIBRARIES)
+ +
+if (ICU_FOUND AND ICU_I18N_FOUND) +if (ICU_FOUND AND ICU_I18N_FOUND)
+ add_definitions (-DBOOST_HAS_ICU=1)
+ include_directories (${ICU_INCLUDE_DIRS})
+ set (BOOST_REGEX_ICU_LIBRARIES ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
+ colormsg (GREEN "+-- ICU (unicode) available for regex, enabling support.")
+ set (NO_STATIC_IF_ICU_FOUND "NO_STATIC")
+else (ICU_FOUND AND ICU_I18N_FOUND)
+ colormsg (CYAN "+-- ICU (unicode) not available for regex, disabling support.")
+endif (ICU_FOUND AND ICU_I18N_FOUND)
+ +
+ add_definitions(-DBOOST_HAS_ICU=1) +#
+ include_directories(${ICU_INCLUDE_DIRS}) +boost_add_library (regex
+ set(BOOST_REGEX_ICU_LIBRARIES ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
+ colormsg(GREEN "+-- ICU (unicode) available, enabling support.")
+ set(NO_STATIC_IF_ICU_FOUND "NO_STATIC")
+
+else()
+
+ colormsg(CYAN "+-- ICU (unicode) not available, disabling support.")
+
+endif()
+
+boost_add_library(regex
+
+ c_regex_traits.cpp + c_regex_traits.cpp
+ cpp_regex_traits.cpp + cpp_regex_traits.cpp
+ cregex.cpp + cregex.cpp
@ -11091,24 +11713,6 @@ index 0000000..8c435b7
+ RELEASE + RELEASE
+ STATIC + STATIC
+ ) + )
diff --git a/tools/build/CMake/.gitignore b/tools/build/CMake/.gitignore
new file mode 100644
index 0000000..5b99088
--- /dev/null
+++ b/tools/build/CMake/.gitignore
@@ -0,0 +1,12 @@
+/build
+tmp
+*.pyc
+._*
+bjam
+project-config.jam
+bin.v2/
+dist/
+.\#*
+*.tar.*
+*.zip
+
diff --git a/tools/build/CMake/Boost.bmp b/tools/build/CMake/Boost.bmp diff --git a/tools/build/CMake/Boost.bmp b/tools/build/CMake/Boost.bmp
new file mode 100644 new file mode 100644
index 0000000..944ab5e index 0000000..944ab5e
@ -14610,16 +15214,6 @@ index 0000000..75bc4f1
+ <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="file://@DOCBOOK_XSL_DIR@/"/> + <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="file://@DOCBOOK_XSL_DIR@/"/>
+ <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.2/" rewritePrefix="file://@DOCBOOK_DTD_DIR@/"/> + <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.2/" rewritePrefix="file://@DOCBOOK_DTD_DIR@/"/>
+</catalog> +</catalog>
diff --git a/tools/build/CMake/docs/.gitignore b/tools/build/CMake/docs/.gitignore
new file mode 100644
index 0000000..7f67dd3
--- /dev/null
+++ b/tools/build/CMake/docs/.gitignore
@@ -0,0 +1,4 @@
+build/doctrees
+build/latex
+Makefile
+
diff --git a/tools/build/CMake/docs/Makefile.in b/tools/build/CMake/docs/Makefile.in diff --git a/tools/build/CMake/docs/Makefile.in b/tools/build/CMake/docs/Makefile.in
new file mode 100644 new file mode 100644
index 0000000..e51563a index 0000000..e51563a
@ -29576,13 +30170,6 @@ index 0000000..3a98b89
+ </body> + </body>
+</html> +</html>
\ No newline at end of file \ No newline at end of file
diff --git a/tools/build/CMake/docs/source/.gitignore b/tools/build/CMake/docs/source/.gitignore
new file mode 100644
index 0000000..4ba4af7
--- /dev/null
+++ b/tools/build/CMake/docs/source/.gitignore
@@ -0,0 +1 @@
+boost_cmake_version.py
diff --git a/tools/build/CMake/docs/source/GitLexer.py b/tools/build/CMake/docs/source/GitLexer.py diff --git a/tools/build/CMake/docs/source/GitLexer.py b/tools/build/CMake/docs/source/GitLexer.py
new file mode 100644 new file mode 100644
index 0000000..20a672e index 0000000..20a672e
@ -36934,13 +37521,6 @@ index 0000000..341ecf8
+boost_external_report(ZLib INCLUDE_DIR LIBRARIES) +boost_external_report(ZLib INCLUDE_DIR LIBRARIES)
+ +
+ +
diff --git a/tools/build/CMake/install_me/.gitignore b/tools/build/CMake/install_me/.gitignore
new file mode 100644
index 0000000..211686a
--- /dev/null
+++ b/tools/build/CMake/install_me/.gitignore
@@ -0,0 +1 @@
+*.cmake
diff --git a/tools/build/CMake/install_me/Boost-thisversion.cmake.in b/tools/build/CMake/install_me/Boost-thisversion.cmake.in diff --git a/tools/build/CMake/install_me/Boost-thisversion.cmake.in b/tools/build/CMake/install_me/Boost-thisversion.cmake.in
new file mode 100644 new file mode 100644
index 0000000..b292097 index 0000000..b292097

56
boost-1.48.0-fix-boost-foreach.patch Normal file
View file

@ -0,0 +1,56 @@
--- trunk/boost/foreach_fwd.hpp (revision 62661)
+++ trunk/boost/foreach_fwd.hpp (revision 75540)
@@ -15,4 +15,6 @@
#define BOOST_FOREACH_FWD_HPP
+#include <utility> // for std::pair
+
// This must be at global scope, hence the uglified name
enum boost_foreach_argument_dependent_lookup_hack
@@ -26,4 +28,7 @@
namespace foreach
{
+ template<typename T>
+ std::pair<T, T> in_range(T begin, T end);
+
///////////////////////////////////////////////////////////////////////////////
// boost::foreach::tag
@@ -47,4 +52,22 @@
} // namespace foreach
+// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131
+namespace BOOST_FOREACH
+{
+ using foreach::in_range;
+ using foreach::tag;
+
+ template<typename T>
+ struct is_lightweight_proxy
+ : foreach::is_lightweight_proxy<T>
+ {};
+
+ template<typename T>
+ struct is_noncopyable
+ : foreach::is_noncopyable<T>
+ {};
+
+} // namespace BOOST_FOREACH
+
} // namespace boost
--- trunk/boost/foreach.hpp (revision 75077)
+++ trunk/boost/foreach.hpp (revision 75540)
@@ -166,5 +166,5 @@
// at the global namespace for your type.
template<typename T>
-inline boost::foreach::is_lightweight_proxy<T> *
+inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
@@ -191,5 +191,5 @@
// at the global namespace for your type.
template<typename T>
-inline boost::foreach::is_noncopyable<T> *
+inline boost::BOOST_FOREACH::is_noncopyable<T> *
boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }

44
boost.spec
View file

@ -10,12 +10,12 @@
Summary: Portable C++ libraries Summary: Portable C++ libraries
Name: boost Name: boost
Version: 1.46.1 Version: 1.48.0
Release: %mkrel 6 Release: %mkrel 2
License: Boost License: Boost
Group: Development/C++ Group: Development/C++
URL: http://boost.org/ URL: http://boost.org/
Source0: http://umn.dl.sourceforge.net/sourceforge/boost/boost_%{packver}.tar.bz2 Source0: http://sourceforge.net/projects/boost/files/boost/%{version}/boost_1_48_0.tar.bz2
%if %cmake_build %if %cmake_build
BuildRequires: cmake BuildRequires: cmake
%else %else
@ -24,9 +24,11 @@ BuildRequires: boost-jam
# (anssi) in bjam mode, use CXXFLAGS when optimization=speed # (anssi) in bjam mode, use CXXFLAGS when optimization=speed
Patch0: boost-use-cxxflags.patch Patch0: boost-use-cxxflags.patch
# (fwang) this patch comes from fedora # (fwang) this patch comes from fedora
Patch1: boost-1.46.1-cmakeify-full.patch Patch1: boost-1.48.0-cmakeify-full.patch
# (fwang) this patch comes from fedora, fetched from upstream, to fix latest lightpark build # (leonardoc) this patch comes from fedora
Patch2: boost-1.46.0-spirit.patch Patch2: boost-1.47.0-exceptions.patch
# (abondrov) https://svn.boost.org/trac/boost/ticket/6131
Patch3: boost-1.48.0-fix-boost-foreach.patch
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -42,7 +44,11 @@ libraries. The emphasis is on libraries which work well with the C++
Standard Library. This package contains only the shared libraries Standard Library. This package contains only the shared libraries
needed for running programs using Boost. needed for running programs using Boost.
%define boostlibs date_time filesystem graph iostreams math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l prg_exec_monitor program_options python regex serialization signals system thread unit_test_framework wave wserialization random %ifarch %arm %mips
%define boostlibs date_time filesystem graph iostreams math_c99 math_c99f math_tr1 math_tr1f prg_exec_monitor program_options python regex serialization signals system thread unit_test_framework wave wserialization random chrono locale timer
%else
%define boostlibs date_time filesystem graph iostreams math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l prg_exec_monitor program_options python regex serialization signals system thread unit_test_framework wave wserialization random chrono locale timer
%endif
# (Anssi 01/2010) dashes are converted to underscores for macros ($lib2); # (Anssi 01/2010) dashes are converted to underscores for macros ($lib2);
# The sed script adds _ when library name ends in number. # The sed script adds _ when library name ends in number.
@ -69,7 +75,7 @@ done)}
%%files -n %%{libname$lib2} %%files -n %%{libname$lib2}
%%defattr(-,root,root) %%defattr(-,root,root)
%%doc LICENSE_1_0.txt %%doc LICENSE_1_0.txt
%{_libdir}/libboost_$lib*.so.%{version} %{_libdir}/libboost_$lib.so.%{version}
EOF EOF
done)} done)}
@ -213,7 +219,23 @@ rm -rf %{buildroot}
%changelog %changelog
* Sun Jun 05 2011 Funda Wang <fwang@mandriva.org> 1.46.1-6mdv2011.0 * Tue Nov 29 2011 Andrey Bondrov <abondrov@mandriva.org> 1.48.0-2mdv2012.0
+ Revision: 735431
- Add patch from upstream to fix problem with forearch in 1.48
* Mon Nov 28 2011 Crispin Boylan <crisb@mandriva.org> 1.48.0-1
+ Revision: 734884
- New release
* Tue Sep 06 2011 Leonardo Coelho <leonardoc@mandriva.com> 1.47.0-1
+ Revision: 698384
- bump new version
- add exceptions to treat boost throw_exception
+ Matthew Dawkins <mattydaw@mandriva.org>
- fix bootlibs macro on arm/mips
* Sun Jun 05 2011 Funda Wang <fwang@mandriva.org> 1.46.1-6
+ Revision: 682806 + Revision: 682806
- rebuild for new icu - rebuild for new icu
@ -302,7 +324,7 @@ rm -rf %{buildroot}
- drop all build patches as cmake can deal with all things :D - drop all build patches as cmake can deal with all things :D
- revert to SONAME=VERSION, keep same with Fedora :( - revert to SONAME=VERSION, keep same with Fedora :(
+ Olivier Blin <oblin@mandriva.com> + Olivier Blin <blino@mandriva.org>
- simplify long-double check - simplify long-double check
- fix build on ARM and MIPS, they don't really have long double (from Arnaud Patard) - fix build on ARM and MIPS, they don't really have long double (from Arnaud Patard)
@ -384,7 +406,7 @@ rm -rf %{buildroot}
+ Revision: 164328 + Revision: 164328
- fix CVE-2008-0171 and CVE-2008-0172 (P0, #37412) - fix CVE-2008-0171 and CVE-2008-0172 (P0, #37412)
+ Olivier Blin <oblin@mandriva.com> + Olivier Blin <blino@mandriva.org>
- restore BuildRoot - restore BuildRoot
+ Thierry Vignaud <tv@mandriva.org> + Thierry Vignaud <tv@mandriva.org>