From ceafcbae485e0614accf6e145d8bc7b69e12a3b5 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 27 Apr 2018 18:10:32 +0100 Subject: [PATCH 1/5] Make Requires: for boost-container unconditional --- boost.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/boost.spec b/boost.spec index 0fa3950..7e34c68 100644 --- a/boost.spec +++ b/boost.spec @@ -35,7 +35,7 @@ Name: boost Summary: The free peer-reviewed portable C++ source libraries Version: 1.66.0 %global version_enc 1_66_0 -Release: 5%{?dist} +Release: 6%{?dist} License: Boost and MIT and Python %global toplev_dirname %{name}_%{version_enc} @@ -57,8 +57,8 @@ Source2: libboost_thread.so # (doc, doctools, examples, jam, static). Requires: boost-atomic%{?_isa} = %{version}-%{release} Requires: boost-chrono%{?_isa} = %{version}-%{release} -%if %{with context} Requires: boost-container%{?_isa} = %{version}-%{release} +%if %{with context} Requires: boost-context%{?_isa} = %{version}-%{release} Requires: boost-coroutine%{?_isa} = %{version}-%{release} %endif @@ -1393,6 +1393,9 @@ fi %{_mandir}/man1/bjam.1* %changelog +* Fri Apr 27 2018 Jonathan Wakely - 1.66.0-6 +- Make Requires: for boost-container unconditional + * Tue Feb 27 2018 Jonathan Wakely - 1.66.0-5 - Ensure boost metapackage installs boost-container and boost-stacktrace. From acdfc457e2b956ee543bf9097fe10a2b997e8a98 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 4 Jun 2018 20:19:41 +0100 Subject: [PATCH 2/5] Add patch for Boost.Compute (#1585515) --- boost-1.66.0-compute.patch | 23 +++++++++++++++++++++++ boost.spec | 9 ++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 boost-1.66.0-compute.patch diff --git a/boost-1.66.0-compute.patch b/boost-1.66.0-compute.patch new file mode 100644 index 0000000..2bd2b4a --- /dev/null +++ b/boost-1.66.0-compute.patch @@ -0,0 +1,23 @@ +From fdbdb94db64e888fce90fe519be23c2a4396a82e Mon Sep 17 00:00:00 2001 +From: pradeep +Date: Tue, 8 May 2018 14:53:38 +0530 +Subject: [PATCH 1/2] Fix return var qualifier in svm_ptr::get_context + +Lack of `const` qualifier is throwing errors with GCC 8.1 +--- + include/boost/compute/memory/svm_ptr.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/boost/compute/memory/svm_ptr.hpp b/include/boost/compute/memory/svm_ptr.hpp +index c8753f5b..56cf1268 100644 +--- a/include/boost/compute/memory/svm_ptr.hpp ++++ b/include/boost/compute/memory/svm_ptr.hpp +@@ -126,7 +126,7 @@ class svm_ptr + return m_ptr - other.m_ptr; + } + +- context& get_context() const ++ const context& get_context() const + { + return m_context; + } diff --git a/boost.spec b/boost.spec index 7e34c68..300de28 100644 --- a/boost.spec +++ b/boost.spec @@ -35,7 +35,7 @@ Name: boost Summary: The free peer-reviewed portable C++ source libraries Version: 1.66.0 %global version_enc 1_66_0 -Release: 6%{?dist} +Release: 7%{?dist} License: Boost and MIT and Python %global toplev_dirname %{name}_%{version_enc} @@ -139,6 +139,9 @@ Patch83: boost-1.66.0-bjam-build-flags.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1545092 Patch84: boost-1.66.0-spirit-abs-overflow.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1585515 +Patch85: boost-1.66.0-compute.patch + %bcond_with tests %bcond_with docs_generated @@ -717,6 +720,7 @@ find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x %patch82 -p1 %patch83 -p1 %patch84 -p1 +%patch85 -p2 # At least python2_version needs to be a macro so that it's visible in # %%install as well. @@ -1393,6 +1397,9 @@ fi %{_mandir}/man1/bjam.1* %changelog +* Tue Jun 05 2018 Jonathan Wakely - 1.66.0-7 +- Add patch for Boost.Compute (#1585515) + * Fri Apr 27 2018 Jonathan Wakely - 1.66.0-6 - Make Requires: for boost-container unconditional From 463af310bee2fb2b7bb25a24f446c3eee982a890 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 18 Jul 2018 17:20:03 +0100 Subject: [PATCH 3/5] Patch numpy for Python 3 (#1596468) --- boost-1.66.0-numpy3.patch | 29 +++++++++++++++++++++++++++++ boost.spec | 10 +++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 boost-1.66.0-numpy3.patch diff --git a/boost-1.66.0-numpy3.patch b/boost-1.66.0-numpy3.patch new file mode 100644 index 0000000..27add8c --- /dev/null +++ b/boost-1.66.0-numpy3.patch @@ -0,0 +1,29 @@ +From 0fce0e589353d772ceda4d493b147138406b22fd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Moritz=20Wanzenb=C3=B6ck?= +Date: Wed, 11 Jul 2018 11:57:46 +0200 +Subject: [PATCH] Add missing return statement in numpy import + +This adds a missing return statement in the python3 specific +import logic of boost.python.numpy. + +For python3 wrap_import_array() needs to return a pointer value. +The import_array() macro only returns NULL in case of error. The +missing return statement is UB, so the compiler can assume it does +not happen. This means the compiler can assume the error branch +is always taken, so import_array must always fail. +--- + src/numpy/numpy.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/numpy/numpy.cpp b/src/numpy/numpy.cpp +index 8e259bc75..3ae2295e3 100644 +--- a/libs/python/src/numpy/numpy.cpp ++++ b/libs/python/src/numpy/numpy.cpp +@@ -19,6 +19,7 @@ static void wrap_import_array() + static void * wrap_import_array() + { + import_array(); ++ return NULL; + } + #endif + diff --git a/boost.spec b/boost.spec index 300de28..ea94c92 100644 --- a/boost.spec +++ b/boost.spec @@ -35,7 +35,7 @@ Name: boost Summary: The free peer-reviewed portable C++ source libraries Version: 1.66.0 %global version_enc 1_66_0 -Release: 7%{?dist} +Release: 8%{?dist} License: Boost and MIT and Python %global toplev_dirname %{name}_%{version_enc} @@ -142,6 +142,10 @@ Patch84: boost-1.66.0-spirit-abs-overflow.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1585515 Patch85: boost-1.66.0-compute.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1596468 +# https://github.com/boostorg/python/pull/218 +Patch87: boost-1.66.0-numpy3.patch + %bcond_with tests %bcond_with docs_generated @@ -721,6 +725,7 @@ find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x %patch83 -p1 %patch84 -p1 %patch85 -p2 +%patch87 -p1 # At least python2_version needs to be a macro so that it's visible in # %%install as well. @@ -1397,6 +1402,9 @@ fi %{_mandir}/man1/bjam.1* %changelog +* Wed Jul 18 2018 Jonathan Wakely - 1.66.0-8 +- Patch numpy for Python 3 (#1596468) + * Tue Jun 05 2018 Jonathan Wakely - 1.66.0-7 - Add patch for Boost.Compute (#1585515) From fb950a13df0b671aabd7dd248c91de9031a89c3b Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 23 Aug 2018 11:46:48 +0100 Subject: [PATCH 4/5] Remove unused ver.py source file. --- boost.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/boost.spec b/boost.spec index ea94c92..7880912 100644 --- a/boost.spec +++ b/boost.spec @@ -42,8 +42,7 @@ License: Boost and MIT and Python URL: http://www.boost.org Source0: https://sourceforge.net/projects/boost/files/boost/%{version}/%{toplev_dirname}.tar.bz2 -Source1: ver.py -Source2: libboost_thread.so +Source1: libboost_thread.so # Since Fedora 13, the Boost libraries are delivered with sonames # equal to the Boost version (e.g., 1.41.0). @@ -1402,6 +1401,9 @@ fi %{_mandir}/man1/bjam.1* %changelog +* Thu Aug 23 2018 Jonathan Wakely - 1.66.0-8 +- Remove unused ver.py source file. + * Wed Jul 18 2018 Jonathan Wakely - 1.66.0-8 - Patch numpy for Python 3 (#1596468) From 3a2ac3f9fe39393a7381349f22dd8538a386bc47 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 23 Aug 2018 12:17:05 +0100 Subject: [PATCH 5/5] Restore source file that is not unused in f28 branch! --- boost.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/boost.spec b/boost.spec index 7880912..ea94c92 100644 --- a/boost.spec +++ b/boost.spec @@ -42,7 +42,8 @@ License: Boost and MIT and Python URL: http://www.boost.org Source0: https://sourceforge.net/projects/boost/files/boost/%{version}/%{toplev_dirname}.tar.bz2 -Source1: libboost_thread.so +Source1: ver.py +Source2: libboost_thread.so # Since Fedora 13, the Boost libraries are delivered with sonames # equal to the Boost version (e.g., 1.41.0). @@ -1401,9 +1402,6 @@ fi %{_mandir}/man1/bjam.1* %changelog -* Thu Aug 23 2018 Jonathan Wakely - 1.66.0-8 -- Remove unused ver.py source file. - * Wed Jul 18 2018 Jonathan Wakely - 1.66.0-8 - Patch numpy for Python 3 (#1596468)