Accepting request 211669 from devel:libraries:c_c++

staging looked ok

OBS-URL: https://build.opensuse.org/request/show/211669
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=84
This commit is contained in:
Stephan Kulow 2013-12-19 12:31:51 +00:00 committed by Git OBS Bridge
commit 5c738617e5
15 changed files with 254 additions and 134 deletions

11
_constraints Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0"?>
<constraints>
<hardware>
<physicalmemory>
<size unit="M">2000</size>
</physicalmemory>
</hardware>
<sandbox>kvm</sandbox>
<hostlabel exclude="true">SLOW_CPU</hostlabel>
</constraints>

View File

@ -1,20 +1,21 @@
package boost-devel
requires -boost-<targettype>
libboost_atomic1_53_0
libboost_context1_53_0
libboost_date_time1_53_0
libboost_filesystem1_53_0
libboost_graph1_53_0
libboost_iostreams1_53_0
libboost_math1_53_0
libboost_mpi1_53_0
libboost_test1_53_0
libboost_program_options1_53_0
libboost_python1_53_0
libboost_random1_53_0
libboost_serialization1_53_0
libboost_signals1_53_0
libboost_system1_53_0
libboost_thread1_53_0
libboost_wave1_53_0
libboost_regex1_53_0
libboost_atomic1_54_0
libboost_context1_54_0
libboost_date_time1_54_0
libboost_filesystem1_54_0
libboost_graph1_54_0
libboost_graph_parallel1_54_0
libboost_iostreams1_54_0
libboost_math1_54_0
libboost_mpi1_54_0
libboost_test1_54_0
libboost_program_options1_54_0
libboost_python1_54_0
libboost_random1_54_0
libboost_serialization1_54_0
libboost_signals1_54_0
libboost_system1_54_0
libboost_thread1_54_0
libboost_wave1_54_0
libboost_regex1_54_0

View File

@ -0,0 +1,19 @@
------------------------------------------------------------------------
r84947 | danieljames | 2013-07-03 22:57:56 +0100 (Wed, 03 Jul 2013) | 4 lines
coroutine: fix typo in Jamfile
From [84622], by olli
------------------------------------------------------------------------
--- 1_54_0/libs/coroutine/build/Jamfile.v2 (revision 84946)
+++ 1_54_0/libs/coroutine/build/Jamfile.v2 (revision 84947)
@@ -40,7 +40,7 @@
: detail/standard_stack_allocator_posix.cpp
;
-explicit yield_sources ;
+explicit allocator_sources ;
lib boost_coroutine
: allocator_sources

View File

@ -0,0 +1,19 @@
------------------------------------------------------------------------
r84948 | danieljames | 2013-07-03 23:02:30 +0100 (Wed, 03 Jul 2013) | 4 lines
In C++11 the shared_ptr -> bool conversion is explicit. In custom time zone code, make the cast explicit. Fixes compilation failure in C++11
From [84626], by marshall.
------------------------------------------------------------------------
--- 1_54_0/boost/date_time/local_time/custom_time_zone.hpp (revision 84947)
+++ 1_54_0/boost/date_time/local_time/custom_time_zone.hpp (revision 84948)
@@ -64,7 +64,7 @@
//! True if zone uses daylight savings adjustments
virtual bool has_dst() const
{
- return (dst_calc_rules_); //if calc_rule is set the tz has dst
+ return (bool) dst_calc_rules_; //if calc_rule is set the tz has dst
}
//! Local time that DST starts -- NADT if has_dst is false
virtual posix_time::ptime dst_local_start_time(gregorian::greg_year y) const

16
boost-1.54-003-log.patch Normal file
View File

@ -0,0 +1,16 @@
------------------------------------------------------------------------
r84966 | andysem | 2013-07-07 11:43:20 +0100 (Sun, 07 Jul 2013) | 1 line
Backported fix for BOOST_LOG_ONCE_BLOCK_FLAG macro definition.
------------------------------------------------------------------------
--- 1_54_0/boost/log/utility/once_block.hpp (revision 84965)
+++ 1_54_0/boost/log/utility/once_block.hpp (revision 84966)
@@ -176,7 +176,7 @@
* been executed.
*/
#define BOOST_LOG_ONCE_BLOCK_FLAG(flag_var)\
- BOOST_LOG_ONCE_BLOCK_INTERNAL(\
+ BOOST_LOG_ONCE_BLOCK_FLAG_INTERNAL(\
flag_var,\
BOOST_LOG_UNIQUE_IDENTIFIER_NAME(_boost_log_once_block_sentry_))

View File

@ -1,46 +0,0 @@
From: Oliver Kowalke <olli@boost.org>
Date: 2013-04-03 14:12:25+02:00
Subject: Fix ppc64 assembler code in context
Upstream: boost#8374
Compiling libs/context/src/asm/make_ppc64_sysv_elf_gas.S failed with:
libs/context/src/asm/make_ppc64_sysv_elf_gas.S: Assembler messages:
libs/context/src/asm/make_ppc64_sysv_elf_gas.S:102: Error: operand out of range (59 is not between 0 and 31)
libs/context/src/asm/make_ppc64_sysv_elf_gas.S:108: Error: operand out of range (64 is not between 0 and 31)
libs/context/src/asm/make_ppc64_sysv_elf_gas.S:131: Error: syntax error; found @', expected ,'
libs/context/src/asm/make_ppc64_sysv_elf_gas.S:131: Error: junk at end of line: `@plt'
---
libs/context/src/asm/make_ppc64_sysv_elf_gas.S | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Index: libs/context/src/asm/make_ppc64_sysv_elf_gas.S
===================================================================
--- libs/context/src/asm/make_ppc64_sysv_elf_gas.S.orig 2012-11-30 08:38:52.000000000 +0100
+++ libs/context/src/asm/make_ppc64_sysv_elf_gas.S 2013-04-03 14:10:43.651126381 +0200
@@ -99,13 +99,13 @@ make_fcontext:
# call align_stack, R3 contains address at 16 byte boundary after return
# == pointer to fcontext_t and address of context stack
- rlwinm %r3, %r3, 0, 0, 59
+ clrrdi %r3, %r3, 4
std %r0, 184(%r3) # save address of context stack (base) in fcontext_t
std %r4, 192(%r3) # save context stack size in fcontext_t
std %r5, 176(%r3) # save address of context function in fcontext_t
- subf %r0, %r3, 64 # 64 bytes on stack for parameter area (== 8 registers)
+ subi %r0, %r3, 64 # 64 bytes on stack for parameter area (== 8 registers)
std %r0, 152(%r3) # save the stack base
mflr %r0 # load LR
@@ -128,5 +128,6 @@ finish:
stwu %r1, -32(%r1) # allocate stack space, SP % 16 == 0
li %r3, 0 # set return value to zero
- bl _exit@plt # exit application
+ bl _exit # exit application
+ nop
.size .make_fcontext, .-.make_fcontext

View File

@ -0,0 +1,36 @@
Upstream URL: https://svn.boost.org/trac/boost/ticket/6701
Check that request size doesn't overflow.
Index: boost/pool/pool.hpp
===================================================================
--- boost/pool/pool.hpp.orig 2007-11-25 19:07:19.000000000 +0100
+++ boost/pool/pool.hpp 2012-06-22 13:03:49.422438613 +0200
@@ -10,6 +10,8 @@
#define BOOST_POOL_HPP
#include <boost/config.hpp> // for workarounds
+// std::numeric_limits
+#include <boost/limits.hpp>
// std::less, std::less_equal, std::greater
#include <functional>
@@ -793,6 +793,9 @@ void * pool<UserAllocator>::ordered_mall
//! \returns Address of chunk n if allocated ok.
//! \returns 0 if not enough memory for n chunks.
+ if (requested_size && (n > (std::numeric_limits<size_type>::max)() / requested_size))
+ return 0;
+
const size_type partition_size = alloc_size();
const size_type total_req_size = n * requested_size;
const size_type num_chunks = total_req_size / partition_size +
@@ -975,6 +979,8 @@
{
if(max_alloc_size && (n > max_alloc_size))
return 0;
+ if(chunk_size && (n > (std::numeric_limits<size_type>::max)() / chunk_size))
+ return 0;
void* ret = (user_allocator::malloc)(chunk_size * n);
used_list.insert(ret);
return ret;

View File

@ -1,46 +1,44 @@
Index: tools/build/v2/tools/boostbook.jam
===================================================================
--- tools/build/v2/tools/boostbook.jam.orig 2011-06-06 22:36:21.000000000 +0200
+++ tools/build/v2/tools/boostbook.jam 2012-03-13 17:20:34.311172162 +0100
@@ -491,40 +491,7 @@ rule generate-xml-catalog ( target : sou
" <rewriteURI uriStartString=\"http://www.boost.org/tools/boostbook/dtd/\" rewritePrefix=\"file://$(boostbook-dtd-dir)/\"/>"
: true ;
--- tools/build/v2/tools/boostbook.jam.orig 2013-05-21 07:14:18.000000000 +0300
+++ tools/build/v2/tools/boostbook.jam 2013-09-18 19:28:13.132000026 +0300
@@ -550,40 +550,7 @@
" <rewriteURI uriStartString=\"http://www.boost.org/tools/boostbook/dtd/\" rewritePrefix=\"file://$(boostbook-dtd-dir)/\"/>"
: true ;
- local docbook-xsl-dir = [ boostbook.docbook-xsl-dir ] ;
- if ! $(docbook-xsl-dir)
- {
- ECHO "BoostBook warning: no DocBook XSL directory specified." ;
- ECHO " If you have the DocBook XSL stylesheets installed, please " ;
- ECHO " set DOCBOOK_XSL_DIR to the stylesheet directory on either " ;
- ECHO " the command line (via -sDOCBOOK_XSL_DIR=...) or in a " ;
- ECHO " Boost.Jam configuration file. The DocBook XSL stylesheets " ;
- ECHO " are available here: http://docbook.sourceforge.net/ " ;
- ECHO " Stylesheets will be downloaded on-the-fly (very slow!) " ;
- }
- else
- {
- docbook-xsl-dir = [ format-catalog-path $(docbook-xsl-dir) ] ;
- print.text " <rewriteURI uriStartString=\"http://docbook.sourceforge.net/release/xsl/current/\" rewritePrefix=\"file://$(docbook-xsl-dir)/\"/>" ;
- }
- local docbook-xsl-dir = [ boostbook.docbook-xsl-dir ] ;
- if ! $(docbook-xsl-dir)
- {
- ECHO "BoostBook warning: no DocBook XSL directory specified." ;
- ECHO " If you have the DocBook XSL stylesheets installed, please " ;
- ECHO " set DOCBOOK_XSL_DIR to the stylesheet directory on either " ;
- ECHO " the command line (via -sDOCBOOK_XSL_DIR=...) or in a " ;
- ECHO " Boost.Jam configuration file. The DocBook XSL stylesheets " ;
- ECHO " are available here: http://docbook.sourceforge.net/ " ;
- ECHO " Stylesheets will be downloaded on-the-fly (very slow!) " ;
- }
- else
- {
- docbook-xsl-dir = [ format-catalog-path $(docbook-xsl-dir) ] ;
- print.text " <rewriteURI uriStartString=\"http://docbook.sourceforge.net/release/xsl/current/\" rewritePrefix=\"file://$(docbook-xsl-dir)/\"/>" ;
- }
-
- local docbook-dtd-dir = [ boostbook.docbook-dtd-dir ] ;
- if ! $(docbook-dtd-dir)
- {
- ECHO "BoostBook warning: no DocBook DTD directory specified." ;
- ECHO " If you have the DocBook DTD installed, please set " ;
- ECHO " DOCBOOK_DTD_DIR to the DTD directory on either " ;
- ECHO " the command line (via -sDOCBOOK_DTD_DIR=...) or in a " ;
- ECHO " Boost.Jam configuration file. The DocBook DTD is available " ;
- ECHO " here: http://www.oasis-open.org/docbook/xml/4.2/index.shtml" ;
- ECHO " The DTD will be downloaded on-the-fly (very slow!) " ;
- }
- else
- {
- docbook-dtd-dir = [ format-catalog-path $(docbook-dtd-dir) ] ;
- print.text " <rewriteURI uriStartString=\"http://www.oasis-open.org/docbook/xml/4.2/\" rewritePrefix=\"file://$(docbook-dtd-dir)/\"/>" ;
- }
- local docbook-dtd-dir = [ boostbook.docbook-dtd-dir ] ;
- if ! $(docbook-dtd-dir)
- {
- ECHO "BoostBook warning: no DocBook DTD directory specified." ;
- ECHO " If you have the DocBook DTD installed, please set " ;
- ECHO " DOCBOOK_DTD_DIR to the DTD directory on either " ;
- ECHO " the command line (via -sDOCBOOK_DTD_DIR=...) or in a " ;
- ECHO " Boost.Jam configuration file. The DocBook DTD is available " ;
- ECHO " here: http://www.oasis-open.org/docbook/xml/4.2/index.shtml" ;
- ECHO " The DTD will be downloaded on-the-fly (very slow!) " ;
- }
- else
- {
- docbook-dtd-dir = [ format-catalog-path $(docbook-dtd-dir) ] ;
- print.text " <rewriteURI uriStartString=\"http://www.oasis-open.org/docbook/xml/4.2/\" rewritePrefix=\"file://$(docbook-dtd-dir)/\"/>" ;
- }
-
+ print.text " <nextCatalog catalog=\"file:///etc/xml/catalog\"/> " ;
print.text "</catalog>" ;
+ print.text " <nextCatalog catalog=\"file:///etc/xml/catalog\"/> " ;
print.text "</catalog>" ;
}

View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Tue Nov 26 16:13:00 CET 2013 - tbehrens@suse.com
- Add boost-pool_check_overflow.patch: Prevent possible overflow when
calculating the amount to malloc (bnc#765443).
Fix from https://svn.boost.org/trac/boost/ticket/6701
-------------------------------------------------------------------
Sun Oct 20 12:51:53 UTC 2013 - jengelh@inai.de
- Split libboost_graph so that the MPI components are not forced
-------------------------------------------------------------------
Wed Sep 18 16:40:37 UTC 2013 - dap.darkness@gmail.com
- Update to 1.54.0. Major changes since 1.53.0:
New libraries:
* Log: Logging library, from Andrey Semashev.
* TTI: Type Traits Introspection library, from Edward Diener.
* Type Erasure: Runtime polymorphism based on concepts.
For a detailed descriptions see
http://www.boost.org/users/history/version_1_54_0.html
- Update broken patch:
* boost-use_std_xml_catalog.patch
- Delete merged patch:
* boost-fix_ppc64_asm.patch
- Add post-release fix patches:
* boost-1.54-001-coroutine.patch
* boost-1.54-002-date-time.patch
* boost-1.54-003-log.patch
- build_pdf define was deleted as unused;
package_pdf was refactored.
- _constraints was added to request more memory to build.
-------------------------------------------------------------------
Sun Aug 18 20:11:52 UTC 2013 - tchvatal@suse.com

View File

@ -16,16 +16,15 @@
#
%define ver 1.53.0
%define file_version 1_53_0
%define short_version 1_53
%define lib_appendix 1_53_0
%define ver 1.54.0
%define file_version 1_54_0
%define short_version 1_54
%define lib_appendix 1_54_0
#Only define to 1 to generate the man pages
%define build_docs 0
#Define to 0 to not generate the pdf documentation
%define build_pdf 0
#Define to 0 to not package the pdf documentation
%define package_pdf 1
# Just hardcode build_mpi to 1 as soon as openmpi builds on all
@ -56,18 +55,16 @@
%define boost_libs4 libboost_signals%{lib_appendix} libboost_system%{lib_appendix} libboost_thread%{lib_appendix}
%define boost_libs5 libboost_wave%{lib_appendix} libboost_regex%{lib_appendix} libboost_regex%{lib_appendix}
%define boost_libs6 libboost_random%{lib_appendix} libboost_chrono%{lib_appendix} libboost_locale%{lib_appendix}
%define boost_libs7 libboost_timer%{lib_appendix}
%define boost_libs7 libboost_timer%{lib_appendix} libboost_atomic%{lib_appendix} libboost_log%{lib_appendix}
%define most_libs %boost_libs1 %boost_libs2 %boost_libs3 %boost_libs4 %boost_libs5 %boost_libs6 %boost_libs7
%if %build_mpi
%define all_libs %{most_libs} libboost_mpi%{lib_appendix}
%define all_libs %{most_libs} libboost_graph_parallel%lib_appendix libboost_mpi%{lib_appendix}
%else
%define all_libs %{most_libs}
%endif
%define debug_package_requires %{all_libs}
Name: boost
BuildRequires: boost-jam >= 3.1.19
BuildRequires: chrpath
@ -97,22 +94,27 @@ Summary: Boost C++ Libraries
License: BSL-1.0
Group: Development/Libraries/C and C++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 1.53.0
Version: 1.54.0
Release: 0
Source0: http://downloads.sourceforge.net/project/boost/boost/1.53.0/%{name}_%{file_version}.tar.bz2
Source0: http://downloads.sourceforge.net/project/boost/boost/%{version}/%{name}_%{file_version}.tar.bz2
Source1: boost-rpmlintrc
Source2: %{name}_%{short_version}_man.tar.bz2
Source3: %{name}_%{short_version}_pdf.tar.bz2
Source3: http://downloads.sourceforge.net/project/boost/boost-docs/%{version}/%{name}_%{file_version}_pdf.tar.bz2
Source4: existing_extra_docs
#Source5: NEWS
Patch1: boost-thread.patch
Patch2: boost-no_type_punning.patch
Patch8: boost-no_segfault_in_Regex_filter.patch
Patch9: boost-pool_check_overflow.patch
Patch20: boost-strict_aliasing.patch
Patch50: boost-use_std_xml_catalog.patch
#PATCH-FIX-UPSTREAM Fix erroneous assembler code for ppc64 [boost#8374]
Patch51: boost-fix_ppc64_asm.patch
Patch60: boost-glibc-2.18.patch
#PATCH-FIX-UPSTREAM A post-release patch.
Patch71: boost-1.54-001-coroutine.patch
#PATCH-FIX-UPSTREAM A post-release patch.
Patch72: boost-1.54-002-date-time.patch
#PATCH-FIX-UPSTREAM A post-release patch.
Patch73: boost-1.54-003-log.patch
Recommends: %{all_libs}
%define _docdir %{_datadir}/doc/packages/boost-%{version}
@ -247,6 +249,13 @@ Requires: boost-license%{lib_appendix}
%description -n libboost_graph%{lib_appendix}
This package contains the Boost::Graph Runtime libraries.
%package -n libboost_graph_parallel%lib_appendix
Summary: Boost graph::distributed runtime libraries
Group: System/Libraries
Requires: boost-license%lib_appendix
%description -n libboost_graph_parallel%lib_appendix
This package contains the boost::graph::distributed runtime libraries.
%package -n libboost_iostreams%{lib_appendix}
Summary: Boost::IOStreams Runtime Libraries
@ -257,6 +266,17 @@ Requires: boost-license%{lib_appendix}
This package contains the Boost::IOStreams Runtime libraries.
%package -n libboost_log%{lib_appendix}
Summary: Run-Time component of boost logging library
Group: System/Libraries
Requires: boost-license%{lib_appendix}
%description -n libboost_log%{lib_appendix}
Boost.Log library aims to make logging significantly easier for the
application developer. It provides a wide range of out-of-the-box
tools along with public interfaces for extending the library.
%package -n libboost_math%{lib_appendix}
Summary: Boost::Math Runtime Libraries
Group: System/Libraries
@ -402,10 +422,13 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
%patch1
%patch2
%patch8
%patch9
%patch20
%patch50
%patch51
%patch60 -p1
%patch71 -p1
%patch72 -p1
%patch73 -p1
#stupid build machinery copies .orig files
find . -name \*.orig -exec rm {} +
@ -530,10 +553,6 @@ rm -f *.manifest
tar -cf - .| tar -C %{buildroot}/%{_mandir} -xvf -
popd
#install the pdf documentation
install -d %buildroot/%{_docdir}/pdf
install -p -m 644 ../%{name}_%{short_version}_pdf/*.pdf %{buildroot}/%{_docdir}/pdf/
#install doc files
dos2unix libs/ptr_container/doc/tutorial_example.html \
libs/parameter/doc/html/reference.html \
@ -562,6 +581,7 @@ rm -f %{buildroot}%{_libdir}/*.a
%post -n libboost_date_time%{lib_appendix} -p /sbin/ldconfig
%post -n libboost_filesystem%{lib_appendix} -p /sbin/ldconfig
%post -n libboost_iostreams%{lib_appendix} -p /sbin/ldconfig
%post -n libboost_log%{lib_appendix} -p /sbin/ldconfig
%post -n libboost_test%{lib_appendix} -p /sbin/ldconfig
%post -n libboost_program_options%{lib_appendix} -p /sbin/ldconfig
%post -n libboost_python%{lib_appendix} -p /sbin/ldconfig
@ -588,6 +608,7 @@ rm -f %{buildroot}%{_libdir}/*.a
%postun -n libboost_date_time%{lib_appendix} -p /sbin/ldconfig
%postun -n libboost_filesystem%{lib_appendix} -p /sbin/ldconfig
%postun -n libboost_iostreams%{lib_appendix} -p /sbin/ldconfig
%postun -n libboost_log%{lib_appendix} -p /sbin/ldconfig
%postun -n libboost_test%{lib_appendix} -p /sbin/ldconfig
%postun -n libboost_program_options%{lib_appendix} -p /sbin/ldconfig
%postun -n libboost_python%{lib_appendix} -p /sbin/ldconfig
@ -635,12 +656,20 @@ rm -f %{buildroot}%{_libdir}/*.a
%files -n libboost_graph%{lib_appendix}
%defattr(-, root, root, -)
%{_libdir}/libboost_graph*.so.*
%{_libdir}/libboost_graph.so.*
%files -n libboost_graph_parallel%lib_appendix
%defattr(-,root,root)
%_libdir/libboost_graph_parallel.so.*
%files -n libboost_iostreams%{lib_appendix}
%defattr(-, root, root, -)
%{_libdir}/libboost_iostreams*.so.*
%files -n libboost_log%{lib_appendix}
%defattr(-, root, root, -)
%{_libdir}/libboost_log*.so.*
%files -n libboost_math%{lib_appendix}
%defattr(-, root, root, -)
%{_libdir}/libboost_math_*.so.*
@ -718,7 +747,6 @@ rm -f %{buildroot}%{_libdir}/*.a
%files doc-html
%defattr(-, root, root, -)
%doc %{_docdir}/*
%exclude %{_docdir}/pdf
%exclude %{_docdir}/LICENSE_1_0.txt
%files doc-man
@ -731,7 +759,7 @@ rm -f %{buildroot}%{_libdir}/*.a
%files doc-pdf
%defattr(-, root, root, -)
%doc %{_docdir}/pdf
%attr(644,root,root) %doc ../%{name}_%{file_version}_pdf/*.pdf
%endif
%changelog

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196
size 55765258

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e65284286fdecdad5c87c0e6e10bb33fd9fd5c9b13a256c9cb3d966cdffb8cf4
size 37656976

3
boost_1_54_0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d
size 57873778

3
boost_1_54_0_pdf.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:59d53ee68f502e26ce40c980bff6599d68c612ea2a7dbdc5b018735e20b7f5a5
size 30499724