From cff41edda167861a43b855dd4065463839f6267ebc20f90712a2df32ba91b8f6 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 9 May 2017 11:40:27 +0000 Subject: [PATCH] Accepting request 493682 from home:adamm:fixing_boost - 1d862615.patch: Fix regression caused by refactoring of serialization code (bnc#1038083) OBS-URL: https://build.opensuse.org/request/show/493682 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=197 --- 1d862615.patch | 19 +++++++++++++++++++ boost.changes | 6 ++++++ boost.spec | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 1d862615.patch diff --git a/1d862615.patch b/1d862615.patch new file mode 100644 index 0000000..89317cd --- /dev/null +++ b/1d862615.patch @@ -0,0 +1,19 @@ +commit 1d86261581230e2dc5d617a9b16287d326f3e229 +Author: Robert Ramey +Date: Wed Feb 1 16:43:59 2017 -0800 + + correct error which appeared when compiling non c++ compliant code for arrays + +diff --git a/include/boost/serialization/array.hpp b/include/boost/serialization/array.hpp +index 61708b3..612d1a6 100644 +--- a/include/boost/serialization/array.hpp ++++ b/include/boost/serialization/array.hpp +@@ -23,6 +23,8 @@ namespace std{ + } // namespace std + #endif + ++#include ++ + #ifndef BOOST_NO_CXX11_HDR_ARRAY + + #include diff --git a/boost.changes b/boost.changes index d092fb3..47cd37f 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 9 10:52:38 UTC 2017 - adam.majer@suse.de + +- 1d862615.patch: Fix regression caused by refactoring of + serialization code (bnc#1038083) + ------------------------------------------------------------------- Mon May 8 11:31:17 UTC 2017 - adam.majer@suse.de diff --git a/boost.spec b/boost.spec index 53cc183..e58fe2e 100644 --- a/boost.spec +++ b/boost.spec @@ -103,6 +103,7 @@ Patch18: dynamic_linking.patch Patch19: mpi_upstream.patch Patch20: python_library_name.patch Patch21: python_numpy_retfunc.patch +Patch22: 1d862615.patch Patch100: gcc_path.patch BuildRequires: chrpath BuildRequires: dos2unix @@ -1061,6 +1062,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p2 %patch100 -p1 #stupid build machinery copies .orig files