diff --git a/_constraints b/_constraints deleted file mode 100644 index 3fa17cc..0000000 --- a/_constraints +++ /dev/null @@ -1,11 +0,0 @@ - - - - - 2000 - - - kvm - SLOW_CPU - - diff --git a/baselibs.conf b/baselibs.conf index 71d05d0..f736776 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,20 +1,20 @@ package boost-devel requires -boost- -libboost_atomic1_54_0 -libboost_context1_54_0 -libboost_date_time1_54_0 -libboost_filesystem1_54_0 -libboost_graph1_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 +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 diff --git a/boost-1.54-001-coroutine.patch b/boost-1.54-001-coroutine.patch deleted file mode 100644 index 8b98de6..0000000 --- a/boost-1.54-001-coroutine.patch +++ /dev/null @@ -1,19 +0,0 @@ ------------------------------------------------------------------------- -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 diff --git a/boost-1.54-002-date-time.patch b/boost-1.54-002-date-time.patch deleted file mode 100644 index 38dc8c7..0000000 --- a/boost-1.54-002-date-time.patch +++ /dev/null @@ -1,19 +0,0 @@ ------------------------------------------------------------------------- -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 diff --git a/boost-1.54-003-log.patch b/boost-1.54-003-log.patch deleted file mode 100644 index 842d1e2..0000000 --- a/boost-1.54-003-log.patch +++ /dev/null @@ -1,16 +0,0 @@ ------------------------------------------------------------------------- -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_)) - diff --git a/boost-fix_ppc64_asm.patch b/boost-fix_ppc64_asm.patch new file mode 100644 index 0000000..058126c --- /dev/null +++ b/boost-fix_ppc64_asm.patch @@ -0,0 +1,46 @@ +From: Oliver Kowalke +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 diff --git a/boost-use_std_xml_catalog.patch b/boost-use_std_xml_catalog.patch index fd4d8b4..fdbce11 100644 --- a/boost-use_std_xml_catalog.patch +++ b/boost-use_std_xml_catalog.patch @@ -1,44 +1,46 @@ ---- 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 @@ - " " - : true ; +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 + " " + : 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 " " ; -- } +- 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 " " ; +- } - -- 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 " " ; -- } +- 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 " " ; +- } - -+ print.text " " ; - print.text "" ; ++ print.text " " ; + print.text "" ; } diff --git a/boost.changes b/boost.changes index b481012..1e120b5 100644 --- a/boost.changes +++ b/boost.changes @@ -1,29 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/boost.spec b/boost.spec index 2d267b0..2b8ddc4 100644 --- a/boost.spec +++ b/boost.spec @@ -16,15 +16,16 @@ # -%define ver 1.54.0 -%define file_version 1_54_0 -%define short_version 1_54 -%define lib_appendix 1_54_0 +%define ver 1.53.0 +%define file_version 1_53_0 +%define short_version 1_53 +%define lib_appendix 1_53_0 #Only define to 1 to generate the man pages %define build_docs 0 -#Define to 0 to not package the pdf documentation +#Define to 0 to not generate the pdf documentation +%define build_pdf 0 %define package_pdf 1 # Just hardcode build_mpi to 1 as soon as openmpi builds on all @@ -55,7 +56,7 @@ %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} libboost_atomic%{lib_appendix} libboost_log%{lib_appendix} +%define boost_libs7 libboost_timer%{lib_appendix} %define most_libs %boost_libs1 %boost_libs2 %boost_libs3 %boost_libs4 %boost_libs5 %boost_libs6 %boost_libs7 @@ -96,12 +97,12 @@ Summary: Boost C++ Libraries License: BSL-1.0 Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 1.54.0 +Version: 1.53.0 Release: 0 -Source0: http://downloads.sourceforge.net/project/boost/boost/%{version}/%{name}_%{file_version}.tar.bz2 +Source0: http://downloads.sourceforge.net/project/boost/boost/1.53.0/%{name}_%{file_version}.tar.bz2 Source1: boost-rpmlintrc Source2: %{name}_%{short_version}_man.tar.bz2 -Source3: http://downloads.sourceforge.net/project/boost/boost-docs/%{version}/%{name}_%{file_version}_pdf.tar.bz2 +Source3: %{name}_%{short_version}_pdf.tar.bz2 Source4: existing_extra_docs #Source5: NEWS Patch1: boost-thread.patch @@ -109,13 +110,9 @@ Patch2: boost-no_type_punning.patch Patch8: boost-no_segfault_in_Regex_filter.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} @@ -260,17 +257,6 @@ 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 @@ -418,10 +404,8 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch8 %patch20 %patch50 +%patch51 %patch60 -p1 -%patch71 -p1 -%patch72 -p1 -%patch73 -p1 #stupid build machinery copies .orig files find . -name \*.orig -exec rm {} + @@ -546,6 +530,10 @@ 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 \ @@ -574,7 +562,6 @@ 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 @@ -601,7 +588,6 @@ 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 @@ -655,10 +641,6 @@ rm -f %{buildroot}%{_libdir}/*.a %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.* @@ -736,6 +718,7 @@ 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 @@ -748,7 +731,7 @@ rm -f %{buildroot}%{_libdir}/*.a %files doc-pdf %defattr(-, root, root, -) -%attr(644,root,root) %doc ../%{name}_%{file_version}_pdf/*.pdf +%doc %{_docdir}/pdf %endif %changelog diff --git a/boost_1_53_0.tar.bz2 b/boost_1_53_0.tar.bz2 new file mode 100644 index 0000000..dea2d30 --- /dev/null +++ b/boost_1_53_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196 +size 55765258 diff --git a/boost_1_54_man.tar.bz2 b/boost_1_53_man.tar.bz2 similarity index 100% rename from boost_1_54_man.tar.bz2 rename to boost_1_53_man.tar.bz2 diff --git a/boost_1_53_pdf.tar.bz2 b/boost_1_53_pdf.tar.bz2 new file mode 100644 index 0000000..1bf8db1 --- /dev/null +++ b/boost_1_53_pdf.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e65284286fdecdad5c87c0e6e10bb33fd9fd5c9b13a256c9cb3d966cdffb8cf4 +size 37656976 diff --git a/boost_1_54_0.tar.bz2 b/boost_1_54_0.tar.bz2 deleted file mode 100644 index 9cfbf95..0000000 --- a/boost_1_54_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d -size 57873778 diff --git a/boost_1_54_0_pdf.tar.bz2 b/boost_1_54_0_pdf.tar.bz2 deleted file mode 100644 index 4c2d31d..0000000 --- a/boost_1_54_0_pdf.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59d53ee68f502e26ce40c980bff6599d68c612ea2a7dbdc5b018735e20b7f5a5 -size 30499724