Compare commits
5 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3a2ac3f9fe | ||
|
|
fb950a13df | ||
|
|
463af310be | ||
|
|
acdfc457e2 | ||
|
|
ceafcbae48 |
3 changed files with 72 additions and 2 deletions
23
boost-1.66.0-compute.patch
Normal file
23
boost-1.66.0-compute.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
From fdbdb94db64e888fce90fe519be23c2a4396a82e Mon Sep 17 00:00:00 2001
|
||||
From: pradeep <pradeep@arrayfire.com>
|
||||
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;
|
||||
}
|
||||
29
boost-1.66.0-numpy3.patch
Normal file
29
boost-1.66.0-numpy3.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
From 0fce0e589353d772ceda4d493b147138406b22fd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Moritz=20Wanzenb=C3=B6ck?= <moritz.wanzenboeck@catalysts.cc>
|
||||
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
|
||||
|
||||
22
boost.spec
22
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: 8%{?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
|
||||
|
|
@ -139,6 +139,13 @@ 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
|
||||
|
||||
# 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
|
||||
|
||||
|
|
@ -717,6 +724,8 @@ find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x
|
|||
%patch82 -p1
|
||||
%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.
|
||||
|
|
@ -1393,6 +1402,15 @@ fi
|
|||
%{_mandir}/man1/bjam.1*
|
||||
|
||||
%changelog
|
||||
* Wed Jul 18 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-8
|
||||
- Patch numpy for Python 3 (#1596468)
|
||||
|
||||
* Tue Jun 05 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-7
|
||||
- Add patch for Boost.Compute (#1585515)
|
||||
|
||||
* Fri Apr 27 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-6
|
||||
- Make Requires: for boost-container unconditional
|
||||
|
||||
* Tue Feb 27 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-5
|
||||
- Ensure boost metapackage installs boost-container and boost-stacktrace.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue