diff --git a/0001-Fix-exec_file-for-Python-3-3.4.patch b/0001-Fix-exec_file-for-Python-3-3.4.patch new file mode 100644 index 0000000..0cd067f --- /dev/null +++ b/0001-Fix-exec_file-for-Python-3-3.4.patch @@ -0,0 +1,31 @@ +From 3e405b6fd5db5615bbef241763de070118222ca7 Mon Sep 17 00:00:00 2001 +From: Stefan Seefeld +Date: Thu, 9 Apr 2015 08:57:08 -0400 +Subject: [PATCH] Fix exec_file for Python 3 < 3.4. + +--- + src/exec.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/exec.cpp b/src/exec.cpp +index 2910db7..12cdabc 100644 +--- a/libs/python/src/exec.cpp ++++ b/libs/python/src/exec.cpp +@@ -86,9 +86,12 @@ object BOOST_PYTHON_DECL exec_file(str filename, object global, object local) + char *f = python::extract(filename); + + // Let python open the file to avoid potential binary incompatibilities. +-#if PY_VERSION_HEX >= 0x03000000 +- // See http://www.codeproject.com/Articles/820116/Embedding-Python-program-in-a-C-Cplusplus-code ++#if PY_VERSION_HEX >= 0x03400000 + FILE *fs = _Py_fopen(f, "r"); ++#elif PY_VERSION_HEX >= 0x03000000 ++ PyObject *fo = Py_BuildValue("s", f); ++ FILE *fs = _Py_fopen(fo, "r"); ++ Py_DECREF(fo); + #else + PyObject *pyfile = PyFile_FromString(f, const_cast("r")); + if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file"); +-- +2.1.0 + diff --git a/0002-Fix-a-regression-with-non-constexpr-types.patch b/0002-Fix-a-regression-with-non-constexpr-types.patch new file mode 100644 index 0000000..5311241 --- /dev/null +++ b/0002-Fix-a-regression-with-non-constexpr-types.patch @@ -0,0 +1,233 @@ +diff --git a/include/boost/fusion/adapted/struct/detail/define_struct.hpp b/include/boost/fusion/adapted/struct/detail/define_struct.hpp +index 2554292..ce3737e 100644 +--- a/boost/fusion/adapted/struct/detail/define_struct.hpp ++++ b/boost/fusion/adapted/struct/detail/define_struct.hpp +@@ -69,7 +69,7 @@ + ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \ + \ + template \ +- BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + self_type& \ + operator=(Seq const& seq) \ + { \ +@@ -128,7 +128,7 @@ + ATTRIBUTE_TUPEL_SIZE, \ + ATTRIBUTES_SEQ) \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + NAME() \ + : BOOST_PP_SEQ_FOR_EACH_I_R( \ + 1, \ +@@ -137,7 +137,7 @@ + ATTRIBUTES_SEQ) \ + {} \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + NAME(self_type const& other_self) \ + : BOOST_PP_SEQ_FOR_EACH_I_R( \ + 1, \ +@@ -147,7 +147,7 @@ + {} \ + \ + template \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + NAME(Seq const& seq \ + BOOST_PP_IF( \ + BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(ATTRIBUTES_SEQ)), \ +@@ -167,7 +167,7 @@ + #define BOOST_FUSION_DEFINE_STRUCT_CTOR_1( \ + NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + explicit \ + NAME(boost::call_traits< \ + BOOST_PP_TUPLE_ELEM( \ +@@ -180,7 +180,7 @@ + #define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_1( \ + TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + explicit \ + NAME(typename boost::call_traits< \ + typename boost::fusion::detail::get_first_arg< \ +@@ -217,7 +217,7 @@ + #define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_N( \ + TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + NAME(BOOST_PP_SEQ_FOR_EACH_I_R( \ + 1, \ + BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_ARG_I, \ +@@ -245,7 +245,7 @@ + #define BOOST_FUSION_DEFINE_STRUCT_CTOR_N( \ + NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + NAME(BOOST_PP_SEQ_FOR_EACH_I_R( \ + 1, \ + BOOST_FUSION_DEFINE_STRUCT_CTOR_ARG_I, \ +diff --git a/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp b/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp +index a5a3ae0..a037ffe 100644 +--- a/boost/fusion/adapted/struct/detail/define_struct_inline.hpp ++++ b/boost/fusion/adapted/struct/detail/define_struct_inline.hpp +@@ -66,7 +66,7 @@ + #define BOOST_FUSION_IGNORE_2(ARG1, ARG2) + + #define BOOST_FUSION_MAKE_COPY_CONSTRUCTOR(NAME, ATTRIBUTES_SEQ) \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + NAME(BOOST_PP_SEQ_FOR_EACH_I( \ + BOOST_FUSION_MAKE_CONST_REF_PARAM, \ + ~, \ +@@ -337,7 +337,7 @@ + typedef boost::mpl::int_ index; \ + typedef boost_fusion_detail_Seq sequence_type; \ + \ +- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \ ++ BOOST_FUSION_GPU_ENABLED \ + BOOST_FUSION_ITERATOR_NAME(NAME)(boost_fusion_detail_Seq& seq) \ + : seq_(seq) \ + BOOST_FUSION_DEFINE_ITERATOR_WKND_INIT_LIST_ENTRIES( \ +diff --git a/test/sequence/adapt_struct.cpp b/test/sequence/adapt_struct.cpp +index c0cd304..121827f 100644 +--- a/libs/fusion/test/sequence/adapt_struct.cpp ++++ b/libs/fusion/test/sequence/adapt_struct.cpp +@@ -67,6 +67,17 @@ namespace ns + foo foo_; + int y; + }; ++ ++ ++ // Testing non-constexpr compatible types ++ struct employee { ++ std::string name; ++ std::string nickname; ++ ++ employee(std::string name, std::string nickname) ++ : name(name), nickname(nickname) ++ {} ++ }; + } + + #if BOOST_PP_VARIADICS +@@ -96,6 +107,13 @@ namespace ns + y + ) + ++ BOOST_FUSION_ADAPT_STRUCT( ++ ns::employee, ++ name, ++ nickname ++ ) ++ ++ + #else // BOOST_PP_VARIADICS + + BOOST_FUSION_ADAPT_STRUCT( +@@ -123,6 +141,12 @@ namespace ns + (BOOST_FUSION_ADAPT_AUTO, y) + ) + ++ BOOST_FUSION_ADAPT_STRUCT( ++ ns::employee, ++ (std::string, name) ++ (BOOST_FUSION_ADAPT_AUTO, nickname) ++ ) ++ + #endif + + int +@@ -224,6 +248,15 @@ main() + BOOST_TEST(v2 >= v1); + } + ++ { ++ ns::employee emp("John Doe", "jdoe"); ++ std::cout << at_c<0>(emp) << std::endl; ++ std::cout << at_c<1>(emp) << std::endl; ++ ++ fusion::vector v1("John Doe", "jdoe"); ++ BOOST_TEST(emp == v1); ++ } ++ + return boost::report_errors(); + } + +diff --git a/test/sequence/define_struct.cpp b/test/sequence/define_struct.cpp +index 795fdf6..63b5a19 100644 +--- a/libs/fusion/test/sequence/define_struct.cpp ++++ b/libs/fusion/test/sequence/define_struct.cpp +@@ -26,6 +26,14 @@ BOOST_FUSION_DEFINE_STRUCT( + + BOOST_FUSION_DEFINE_STRUCT(BOOST_PP_EMPTY(), s, (int, m)) + ++// Testing non-constexpr compatible types ++BOOST_FUSION_DEFINE_STRUCT( ++ (ns), ++ employee, ++ (std::string, name) ++ (std::string, nickname) ++) ++ + int + main() + { +@@ -100,6 +108,14 @@ main() + BOOST_TEST(p == make_vector(3,5)); + } + ++ { ++ ns::employee emp = make_list("John Doe", "jdoe"); ++ std::cout << at_c<0>(emp) << std::endl; ++ std::cout << at_c<1>(emp) << std::endl; ++ ++ BOOST_TEST(emp == make_vector("John Doe", "jdoe")); ++ } ++ + return boost::report_errors(); + } + +diff --git a/test/sequence/define_struct_inline.cpp b/test/sequence/define_struct_inline.cpp +index e849ce9..d34a142 100644 +--- a/libs/fusion/test/sequence/define_struct_inline.cpp ++++ b/libs/fusion/test/sequence/define_struct_inline.cpp +@@ -41,6 +41,13 @@ namespace ns + BOOST_FUSION_DEFINE_STRUCT_INLINE(s, (int, m)) + + BOOST_FUSION_DEFINE_STRUCT_INLINE(empty_struct, ) ++ ++ // Testing non-constexpr compatible types ++ BOOST_FUSION_DEFINE_STRUCT_INLINE( ++ employee, ++ (std::string, name) ++ (std::string, nickname) ++ ) + } + + template +@@ -128,6 +135,17 @@ main() + { + run_test(); // test with non-template enclosing class + run_test::point>(); // test with template enclosing class ++ ++ { ++ using namespace boost::fusion; ++ ++ ns::employee emp = make_list("John Doe", "jdoe"); ++ std::cout << at_c<0>(emp) << std::endl; ++ std::cout << at_c<1>(emp) << std::endl; ++ ++ BOOST_TEST(emp == make_vector("John Doe", "jdoe")); ++ } ++ + return boost::report_errors(); + + } diff --git a/baselibs.conf b/baselibs.conf index cfd088a..0bc7cb9 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,23 +1,23 @@ boost-devel requires -boost- -libboost_atomic1_56_0 -libboost_container1_56_0 -libboost_context1_56_0 -libboost_coroutine1_56_0 -libboost_date_time1_56_0 -libboost_filesystem1_56_0 -libboost_graph1_56_0 -libboost_graph_parallel1_56_0 -libboost_iostreams1_56_0 -libboost_math1_56_0 -libboost_mpi1_56_0 -libboost_test1_56_0 -libboost_program_options1_56_0 -libboost_python1_56_0 -libboost_random1_56_0 -libboost_serialization1_56_0 -libboost_signals1_56_0 -libboost_system1_56_0 -libboost_thread1_56_0 -libboost_wave1_56_0 -libboost_regex1_56_0 +libboost_atomic1_58_0 +libboost_container1_58_0 +libboost_context1_58_0 +libboost_coroutine1_58_0 +libboost_date_time1_58_0 +libboost_filesystem1_58_0 +libboost_graph1_58_0 +libboost_graph_parallel1_58_0 +libboost_iostreams1_58_0 +libboost_math1_58_0 +libboost_mpi1_58_0 +libboost_test1_58_0 +libboost_program_options1_58_0 +libboost_python1_58_0 +libboost_random1_58_0 +libboost_serialization1_58_0 +libboost_signals1_58_0 +libboost_system1_58_0 +libboost_thread1_58_0 +libboost_wave1_58_0 +libboost_regex1_58_0 diff --git a/bjam-alignment.patch b/bjam-alignment.patch deleted file mode 100644 index 5f54823..0000000 --- a/bjam-alignment.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: boost_1_56_0/tools/build/src/engine/function.c -=================================================================== ---- boost_1_56_0.orig/tools/build/src/engine/function.c -+++ boost_1_56_0/tools/build/src/engine/function.c -@@ -230,7 +230,7 @@ STACK * stack_global() - - static void check_alignment( STACK * s ) - { -- assert( (size_t)s->data % sizeof( LIST * ) == 0 ); -+ assert( (size_t)s->data % __alignof__( LIST * ) == 0 ); - } - - void * stack_allocate( STACK * s, int size ) diff --git a/boost-aarch64-flags.patch b/boost-aarch64-flags.patch new file mode 100644 index 0000000..d7ea382 --- /dev/null +++ b/boost-aarch64-flags.patch @@ -0,0 +1,15 @@ +Index: boost_1_58_0/tools/build/src/tools/gcc.jam +=================================================================== +--- boost_1_58_0.orig/tools/build/src/tools/gcc.jam ++++ boost_1_58_0/tools/build/src/tools/gcc.jam +@@ -457,10 +457,6 @@ rule setup-address-model ( targets * : s + { + option = -m32 ; + } +- else if $(model) = 64 +- { +- option = -m64 ; +- } + } + # For darwin, the model can be 32_64. darwin.jam will handle that + # on its own. diff --git a/boost-disable-pch-on-aarch64.patch b/boost-disable-pch-on-aarch64.patch new file mode 100644 index 0000000..f9d38d7 --- /dev/null +++ b/boost-disable-pch-on-aarch64.patch @@ -0,0 +1,74 @@ +Index: boost_1_58_0/libs/math/build/Jamfile.v2 +=================================================================== +--- boost_1_58_0.orig/libs/math/build/Jamfile.v2 ++++ boost_1_58_0/libs/math/build/Jamfile.v2 +@@ -4,23 +4,17 @@ + # http://www.boost.org/LICENSE_1_0.txt. + + import testing ; +-import pch ; + + project + : requirements + intel-win:-nologo + intel-win:-nologo +- #intel-linux:off +- intel-darwin:off +- msvc-7.1:off +- gcc,windows:off + #gcc:-fvisibility=hidden + intel-linux:-fvisibility=hidden + sun:-xldscope=hidden + [ check-target-builds ../config//has_gcc_visibility "gcc visibility" : gcc:-fvisibility=hidden : ] + ; + +-cpp-pch pch : ../src/tr1/pch.hpp : ../src/tr1 shared:BOOST_MATH_TR1_DYN_LINK=1 ; + + C99_SOURCES = acosh + asinh +@@ -80,19 +74,19 @@ obj long_double_check : ../config/has_lo + explicit long_double_check ; + + # Library targets +-lib boost_math_tr1 : ../src/tr1/$(TR1_SOURCES).cpp pch ++lib boost_math_tr1 : ../src/tr1/$(TR1_SOURCES).cpp + : + shared:BOOST_MATH_TR1_DYN_LINK=1 + ../src/tr1 + ; + +-lib boost_math_tr1f : ../src/tr1/$(TR1_SOURCES)f.cpp pch ++lib boost_math_tr1f : ../src/tr1/$(TR1_SOURCES)f.cpp + : + shared:BOOST_MATH_TR1_DYN_LINK=1 + ../src/tr1 + ; + +-lib boost_math_tr1l : ../src/tr1/$(TR1_SOURCES)l.cpp pch ++lib boost_math_tr1l : ../src/tr1/$(TR1_SOURCES)l.cpp + : + shared:BOOST_MATH_TR1_DYN_LINK=1 + ../config//has_long_double_support +@@ -100,19 +94,19 @@ lib boost_math_tr1l : ../src/tr1/$(TR1_S + [ check-target-builds ../config//has_long_double_support "long double support" : : no ] + ; + +-lib boost_math_c99 : ../src/tr1/$(C99_SOURCES).cpp pch ++lib boost_math_c99 : ../src/tr1/$(C99_SOURCES).cpp + : + shared:BOOST_MATH_TR1_DYN_LINK=1 + ../src/tr1 + ; + +-lib boost_math_c99f : ../src/tr1/$(C99_SOURCES)f.cpp pch ++lib boost_math_c99f : ../src/tr1/$(C99_SOURCES)f.cpp + : + shared:BOOST_MATH_TR1_DYN_LINK=1 + ../src/tr1 + ; + +-lib boost_math_c99l : ../src/tr1/$(C99_SOURCES)l.cpp pch ++lib boost_math_c99l : ../src/tr1/$(C99_SOURCES)l.cpp + : + shared:BOOST_MATH_TR1_DYN_LINK=1 + ../config//has_long_double_support diff --git a/boost-gcc5.patch b/boost-gcc5.patch deleted file mode 100644 index ced6878..0000000 --- a/boost-gcc5.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libs/coroutine/build/Jamfile.v2 -=================================================================== ---- libs/coroutine/build/Jamfile.v2.orig 2014-07-09 19:45:23.000000000 +0200 -+++ libs/coroutine/build/Jamfile.v2 2015-02-23 14:30:47.673766402 +0100 -@@ -24,6 +24,7 @@ project boost/coroutine - gcc-4.9,on:"-static-libgcc" - clang-3.4,on:-fsplit-stack - clang-3.4,on:"-static-libgcc" -+ gcc:-std=c++11 - shared:BOOST_COROUTINES_DYN_LINK=1 - BOOST_COROUTINES_SOURCE - : usage-requirements diff --git a/boost-rpmoptflags-only.patch b/boost-rpmoptflags-only.patch new file mode 100644 index 0000000..2cd3a03 --- /dev/null +++ b/boost-rpmoptflags-only.patch @@ -0,0 +1,48 @@ +diff -up ./tools/build/src/tools/gcc.jam~ ./tools/build/src/tools/gcc.jam +--- ./tools/build/src/tools/gcc.jam~ 2015-02-09 15:01:04.850331626 +0100 ++++ ./tools/build/src/tools/gcc.jam 2015-02-09 15:44:29.122307134 +0100 +@@ -366,17 +366,17 @@ generators.override gcc.compile.c++.pch + toolset.flags gcc.compile PCH_FILE on : ; + + # Declare flags and action for compilation. +-toolset.flags gcc.compile OPTIONS off : -O0 ; +-toolset.flags gcc.compile OPTIONS speed : -O3 ; +-toolset.flags gcc.compile OPTIONS space : -Os ; ++toolset.flags gcc.compile OPTIONS off : ; ++toolset.flags gcc.compile OPTIONS speed : ; ++toolset.flags gcc.compile OPTIONS space : ; + +-toolset.flags gcc.compile OPTIONS off : -fno-inline ; +-toolset.flags gcc.compile OPTIONS on : -Wno-inline ; +-toolset.flags gcc.compile OPTIONS full : -finline-functions -Wno-inline ; ++toolset.flags gcc.compile OPTIONS off : ; ++toolset.flags gcc.compile OPTIONS on : ; ++toolset.flags gcc.compile OPTIONS full : ; + +-toolset.flags gcc.compile OPTIONS off : -w ; +-toolset.flags gcc.compile OPTIONS on : -Wall ; +-toolset.flags gcc.compile OPTIONS all : -Wall -pedantic ; ++toolset.flags gcc.compile OPTIONS off : ; ++toolset.flags gcc.compile OPTIONS on : ; ++toolset.flags gcc.compile OPTIONS all : ; + toolset.flags gcc.compile OPTIONS on : -Werror ; + + toolset.flags gcc.compile OPTIONS on : -g ; +@@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc + + actions compile.c++ bind PCH_FILE + { +- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)" ++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)" + } + + actions compile.c bind PCH_FILE +@@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE + + actions compile.c++.preprocess bind PCH_FILE + { +- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)" ++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)" + } + + actions compile.c.preprocess bind PCH_FILE diff --git a/boost-thread.patch b/boost-thread.patch index 0a3b819..f17bd0d 100644 --- a/boost-thread.patch +++ b/boost-thread.patch @@ -1,8 +1,8 @@ -Index: boost_1_56_0/boost/config/compiler/gcc.hpp +Index: boost_1_58_0/boost/config/compiler/gcc.hpp =================================================================== ---- boost_1_56_0.orig/boost/config/compiler/gcc.hpp -+++ boost_1_56_0/boost/config/compiler/gcc.hpp -@@ -68,7 +68,7 @@ +--- boost_1_58_0.orig/boost/config/compiler/gcc.hpp ++++ boost_1_58_0/boost/config/compiler/gcc.hpp +@@ -73,7 +73,7 @@ // those platforms where we can know for sure). It will get turned off again // later if no threading API is detected. // diff --git a/boost-uuid-comparison.patch b/boost-uuid-comparison.patch new file mode 100644 index 0000000..3119cc2 --- /dev/null +++ b/boost-uuid-comparison.patch @@ -0,0 +1,24 @@ +From fc32eea4ac9e514a7d210306cd9fa3a017dfe02c Mon Sep 17 00:00:00 2001 +From: VemundH +Date: Tue, 30 Sep 2014 21:53:45 +0200 +Subject: [PATCH] remove incorrect casts + +see https://github.com/boostorg/uuid/pull/5 + +--- + include/boost/uuid/detail/uuid_x86.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/boost/uuid/detail/uuid_x86.hpp b/include/boost/uuid/detail/uuid_x86.hpp +index 1a329b0..5a2cdec 100644 +--- a/boost/uuid/detail/uuid_x86.hpp ++++ b/boost/uuid/detail/uuid_x86.hpp +@@ -100,7 +100,7 @@ inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT + cmp = (cmp - 1u) ^ cmp; + rcmp = (rcmp - 1u) ^ rcmp; + +- return static_cast< uint16_t >(cmp) < static_cast< uint16_t >(rcmp); ++ return cmp < rcmp; + } + + } // namespace uuids diff --git a/boost.changes b/boost.changes index c841b27..0ca00a8 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sat May 9 09:01:32 UTC 2015 - dmueller@suse.com + +- update to 1.58.0: + boost docs remain at 1.56 since upstream hasn't updated yet + * New Libraries: Endian, Sort. + * Updated Libraries: Asio, Chrono, Container, Context, Conversion, + DateTime, Flyweight, Function, Functional/Factory, Fusion, Geometry, + Hash, Interprocess, Intrusive, Lexical Cast, Log, Math, Move, + Multi-index Containers, Multiprecision, Optional, Phoenix, + Predef, Random, Thread, TypeErasure, TypeIndex, Units, + Unordered, Variant. + See http://www.boost.org/users/history/version_1_58_0.html +- add 0001-Fix-exec_file-for-Python-3-3.4.patch , + 0002-Fix-a-regression-with-non-constexpr-types.patch: Fixes regressions + in 1.58 +- drop bjam-alignment.patch, boost-gcc5.patch: Already fixed upstream + differently +- add boost-rpmoptflags-only.patch: Build only with optflags +- add boost-aarch64-flags.patch: Avoid using -m64 +- add boost-uuid-comparison.patch: Fix regression in UUID operator< +- add boost-disable-pch-on-aarch64.patch: Disable pch on math library + to avoid compiler segfault + ------------------------------------------------------------------- Mon Mar 9 14:47:09 UTC 2015 - rneuhauser@suse.cz diff --git a/boost.spec b/boost.spec index 3f1e779..4b26af7 100644 --- a/boost.spec +++ b/boost.spec @@ -1,7 +1,7 @@ # # spec file for package boost # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,11 @@ # -%define ver 1.56.0 -%define file_version 1_56_0 +%define ver 1.58.0 +%define file_version 1_58_0 +%define docs_version 1.56.0 %define short_version 1_56 -%define lib_appendix 1_56_0 +%define lib_appendix 1_58_0 #Only define to 1 to generate the man pages %define build_docs 0 @@ -51,18 +52,18 @@ %define disable_long_double 0 %endif -%define boost_libs1 libboost_date_time%{lib_appendix} libboost_filesystem%{lib_appendix} libboost_graph%{lib_appendix} -%define boost_libs2 libboost_iostreams%{lib_appendix} libboost_math%{lib_appendix} libboost_test%{lib_appendix} -%define boost_libs3 libboost_program_options%{lib_appendix} libboost_python%{lib_appendix} libboost_serialization%{lib_appendix} -%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} libboost_container%{lib_appendix} +%define boost_l1 libboost_date_time%{lib_appendix} libboost_filesystem%{lib_appendix} libboost_graph%{lib_appendix} +%define boost_l2 libboost_iostreams%{lib_appendix} libboost_math%{lib_appendix} libboost_test%{lib_appendix} +%define boost_l3 libboost_program_options%{lib_appendix} libboost_python%{lib_appendix} libboost_serialization%{lib_appendix} +%define boost_l4 libboost_signals%{lib_appendix} libboost_system%{lib_appendix} libboost_thread%{lib_appendix} +%define boost_l5 libboost_wave%{lib_appendix} libboost_regex%{lib_appendix} libboost_regex%{lib_appendix} +%define boost_l6 libboost_random%{lib_appendix} libboost_chrono%{lib_appendix} libboost_locale%{lib_appendix} +%define boost_l7 libboost_timer%{lib_appendix} libboost_atomic%{lib_appendix} libboost_log%{lib_appendix} libboost_container%{lib_appendix} %if %build_context %define boost_libs_context libboost_context%{lib_appendix} libboost_coroutine%{lib_appendix} %endif -%define most_libs %boost_libs1 %boost_libs2 %boost_libs3 %boost_libs4 %boost_libs5 %boost_libs6 %boost_libs7 %{?boost_libs_context} +%define most_libs %boost_l1 %boost_l2 %boost_l3 %boost_l4 %boost_l5 %boost_l6 %boost_l7 %{?boost_libs_context} %if %build_mpi %define all_libs %{most_libs} libboost_graph_parallel%lib_appendix libboost_mpi%{lib_appendix} @@ -71,7 +72,7 @@ %endif Name: boost -Version: 1.56.0 +Version: 1.58.0 Release: 0 Summary: Boost C++ Libraries License: BSL-1.0 @@ -79,7 +80,7 @@ Group: Development/Libraries/C and C++ Url: http://www.boost.org Source0: http://downloads.sourceforge.net/project/boost/boost/%{version}/%{name}_%{file_version}.tar.bz2 Source1: boost-rpmlintrc -Source3: http://downloads.sourceforge.net/project/boost/boost-docs/%{version}/%{name}_%{short_version}_pdf.tar.bz2 +Source3: http://downloads.sourceforge.net/project/boost/boost-docs/%{docs_version}/%{name}_%{short_version}_pdf.tar.bz2 Source4: existing_extra_docs #Source5: NEWS Source100: baselibs.conf @@ -89,8 +90,12 @@ Patch3: boost-no_segfault_in_Regex_filter.patch Patch4: boost-pool_check_overflow.patch Patch5: boost-strict_aliasing.patch Patch6: boost-use_std_xml_catalog.patch -Patch7: bjam-alignment.patch -Patch8: boost-gcc5.patch +Patch7: boost-rpmoptflags-only.patch +Patch9: 0001-Fix-exec_file-for-Python-3-3.4.patch +Patch10: 0002-Fix-a-regression-with-non-constexpr-types.patch +Patch11: boost-aarch64-flags.patch +Patch12: boost-uuid-comparison.patch +Patch13: boost-disable-pch-on-aarch64.patch BuildRequires: chrpath BuildRequires: dos2unix BuildRequires: fdupes @@ -423,8 +428,14 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch4 %patch5 %patch6 -p1 -%patch7 -p1 -%patch8 +%patch7 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%ifarch aarch64 +%patch13 -p1 +%endif #stupid build machinery copies .orig files find . -name \*.orig -exec rm {} + @@ -451,9 +462,6 @@ elif test "$Mem" -lt 7000000; then # lower number of jobs if memory is less than 7G but more than 4G JOBS=2 fi -if test "$JOBS" = 0; then - JOBS=1 -fi # In case you want more parallel jobs than autobuild grants you #if [ $J_P -gt $J_I ]; then diff --git a/boost_1_56_0.tar.bz2 b/boost_1_56_0.tar.bz2 deleted file mode 100644 index ddf3a3e..0000000 --- a/boost_1_56_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:134732acaf3a6e7eba85988118d943f0fa6b7f0850f65131fff89823ad30ff1d -size 94777674 diff --git a/boost_1_58_0.tar.bz2 b/boost_1_58_0.tar.bz2 new file mode 100644 index 0000000..8fd4087 --- /dev/null +++ b/boost_1_58_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5 +size 70394057