[arrayfire] 01/04: Build with compute library from Boost 1.61.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository arrayfire.

commit 027b29f3cc2c12e0bcff11cc20ffbe8114b232d1
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Aug 12 08:39:55 2016 +0100

    Build with compute library from Boost 1.61.
---
 debian/control                                     |  3 +--
 .../Use-compute-library-from-Boost-1.61.patch      | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  1 -
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index f13dc3b..690178d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,10 @@ Testsuite: autopkgtest
 Priority: optional
 Build-Depends: cmake,
                debhelper (>= 9),
-               libboost-dev,
+               libboost-dev (>= 1.61),
                libblas-dev | libblas.so,
                libclblas-dev,
                libclfft-dev,
-               libcompute-dev,
                libfftw3-dev,
                libfreeimage-dev,
                libgtest-dev,
diff --git a/debian/patches/Use-compute-library-from-Boost-1.61.patch b/debian/patches/Use-compute-library-from-Boost-1.61.patch
new file mode 100644
index 0000000..4aa0952
--- /dev/null
+++ b/debian/patches/Use-compute-library-from-Boost-1.61.patch
@@ -0,0 +1,31 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Fri, 12 Aug 2016 08:35:19 +0100
+Subject: Use compute library from Boost 1.61.
+
+---
+ src/backend/opencl/CMakeLists.txt | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt
+index ded53bf..d7e3628 100644
+--- a/src/backend/opencl/CMakeLists.txt
++++ b/src/backend/opencl/CMakeLists.txt
+@@ -84,11 +84,13 @@ ADD_DEFINITIONS( -DBOOST_ALL_NO_LIB )
+ SET(Boost_USE_STATIC_LIBS OFF)
+ FIND_PACKAGE(Boost 1.48 REQUIRED)
+ 
+-OPTION(USE_SYSTEM_BOOST_COMPUTE "Use system BoostCompute" OFF)
+-IF(USE_SYSTEM_BOOST_COMPUTE)
+-    FIND_PACKAGE(BoostCompute REQUIRED)
+-ELSE()
+-    INCLUDE("${CMAKE_MODULE_PATH}/build_boost_compute.cmake")
++IF(Boost_VERSION VERSION_LESS "1.61")
++    OPTION(USE_SYSTEM_BOOST_COMPUTE "Use system BoostCompute" OFF)
++    IF(USE_SYSTEM_BOOST_COMPUTE)
++        FIND_PACKAGE(BoostCompute REQUIRED)
++    ELSE()
++        INCLUDE("${CMAKE_MODULE_PATH}/build_boost_compute.cmake")
++    ENDIF()
+ ENDIF()
+ 
+ SET( cl_kernel_headers
diff --git a/debian/patches/series b/debian/patches/series
index e0836f2..59e4970 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ Use-system-gtest.patch
 Disable-git-usage-in-Doxygen-settings.patch
 Fix-LAPACKE-detection.patch
 Enable-support-for-GNU-Hurd.patch
+Use-compute-library-from-Boost-1.61.patch
diff --git a/debian/rules b/debian/rules
index d1974a6..946c228 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,6 @@ BUILD_OPTIONS = \
 	-DBUILD_NONFREE=OFF \
 	-DBUILD_OPENCL=ON \
 	-DBUILD_UNIFIED=ON \
-	-DUSE_SYSTEM_BOOST_COMPUTE=ON \
 	-DUSE_SYSTEM_CLBLAS=ON \
 	-DUSE_SYSTEM_CLFFT=ON \
 	-DWITH_COVERAGE=OFF

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git