[arrayfire] 02/06: Update patch queue: - Drop Fix-documentation-target.patch, Fix-examples-target.patch and Fix-missing-cstdio-include.patch, applied upstream. - Refresh Use-custom-cflags-in-examples.patch and Use-system-gtest.patch. - Refresh Fix-CBLAS-detection.patch, use upstream fix. - Add Fix-missing-includes-in-testsuite.patch, fix FTBFS in testsuite on Ubuntu 14.04.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Dec 8 11:55:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to annotated tag debian/3.2.1+dfsg1-1
in repository arrayfire.
commit 2c831d9ead330bb9a8d4e5c6346e7c282fb40772
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Mon Dec 7 00:25:19 2015 +0000
Update patch queue:
- Drop Fix-documentation-target.patch, Fix-examples-target.patch and Fix-missing-cstdio-include.patch, applied upstream.
- Refresh Use-custom-cflags-in-examples.patch and Use-system-gtest.patch.
- Refresh Fix-CBLAS-detection.patch, use upstream fix.
- Add Fix-missing-includes-in-testsuite.patch, fix FTBFS in testsuite on Ubuntu 14.04.
---
debian/patches/Fix-CBLAS-detection.patch | 30 ++++++++----
debian/patches/Fix-documentation-target.patch | 57 ----------------------
debian/patches/Fix-examples-target.patch | 25 ----------
debian/patches/Fix-missing-cstdio-include.patch | 20 --------
.../Fix-missing-includes-in-testsuite.patch | 21 ++++++++
debian/patches/Use-custom-cflags-in-examples.patch | 4 +-
debian/patches/Use-system-gtest.patch | 9 ++--
debian/patches/series | 4 +-
8 files changed, 46 insertions(+), 124 deletions(-)
diff --git a/debian/patches/Fix-CBLAS-detection.patch b/debian/patches/Fix-CBLAS-detection.patch
index e493c56..c0c13fb 100644
--- a/debian/patches/Fix-CBLAS-detection.patch
+++ b/debian/patches/Fix-CBLAS-detection.patch
@@ -6,16 +6,26 @@ Subject: Fix CBLAS detection.
CMakeModules/FindCBLAS.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/CMakeModules/FindCBLAS.cmake b/CMakeModules/FindCBLAS.cmake
-index d08b3c2..915059e 100644
--- a/CMakeModules/FindCBLAS.cmake
+++ b/CMakeModules/FindCBLAS.cmake
-@@ -26,7 +26,7 @@ SET(CBLAS_INCLUDE_FILE CACHE STRING
- # all further checks.
- FIND_PACKAGE(PkgConfig)
- IF(PKG_CONFIG_FOUND)
-- PKG_CHECK_MODULES(PC_CBLAS cblas)
-+ PKG_CHECK_MODULES(PC_CBLAS blas)
- ENDIF(PKG_CONFIG_FOUND)
+@@ -280,6 +280,20 @@
+ TRUE)
+ ENDIF(NOT CBLAS_LIBRARIES)
- IF(PC_CBLAS_FOUND)
++# Generic BLAS+CBLAS library
++# Debian based systems have them as single library
++IF(NOT CBLAS_LIBRARIES)
++ CHECK_ALL_LIBRARIES(
++ CBLAS_LIBRARIES
++ CBLAS
++ cblas_dgemm
++ ""
++ "blas"
++ "cblas.h"
++ TRUE,
++ TRUE)
++ENDIF(NOT CBLAS_LIBRARIES)
++
+ IF(CBLAS_LIBRARIES)
+ IF (NOT MKL_CBLAS_FOUND)
+ SET(CBLAS_FOUND TRUE)
diff --git a/debian/patches/Fix-documentation-target.patch b/debian/patches/Fix-documentation-target.patch
deleted file mode 100644
index 3702fc0..0000000
--- a/debian/patches/Fix-documentation-target.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Sun, 22 Nov 2015 17:04:59 +0000
-Subject: Fix documentation target.
-
----
- docs/CMakeLists.txt | 9 +++------
- docs/doxygen.mk | 4 ++--
- 2 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index ec7f384..fbc02e1 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -21,18 +21,15 @@ CONFIGURE_FILE(${AF_DOCS_LAYOUT} ${AF_DOCS_LAYOUT_OUT})
- ADD_CUSTOM_TARGET(docs
- ALL
- COMMAND ${DOXYGEN_EXECUTABLE} ${AF_DOCS_CONFIG_OUT}
-- COMMAND cmake -E copy_directory ${ASSETS_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-- COMMAND cmake -E remove ${CMAKE_CURRENT_BINARY_DIR}/.git
-+ COMMAND cmake -E copy_directory ${ASSETS_DIR} ${CMAKE_CURRENT_BINARY_DIR}/html
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "Generating Documentation"
- VERBATIM)
-
- # Install Doxygen documentation
--INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION ${AF_INSTALL_DOC_DIR}
-+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${AF_INSTALL_DOC_DIR}
- COMPONENT documentation
-- PATTERN "*"
-- PATTERN "CMakeFiles" EXCLUDE
-- PATTERN "man" EXCLUDE
-+ PATTERN ".git" EXCLUDE
- )
-
- # Install man pages
-diff --git a/docs/doxygen.mk b/docs/doxygen.mk
-index 1a1a266..2c64c41 100644
---- a/docs/doxygen.mk
-+++ b/docs/doxygen.mk
-@@ -58,7 +58,7 @@ PROJECT_LOGO = ${ASSETS_DIR}/arrayfire_logo.png
- # entered, it will be relative to the location where doxygen was started. If
- # left blank the current directory will be used.
-
--OUTPUT_DIRECTORY = .
-+OUTPUT_DIRECTORY = ${CMAKE_CURRENT_BINARY_DIR}
-
- # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
- # directories (in 2 levels) under the output directory of each output format and
-@@ -1039,7 +1039,7 @@ GENERATE_HTML = YES
- # The default directory is: html.
- # This tag requires that the tag GENERATE_HTML is set to YES.
-
--HTML_OUTPUT = .
-+HTML_OUTPUT = html
-
- # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
- # generated HTML page (for example: .htm, .php, .asp).
diff --git a/debian/patches/Fix-examples-target.patch b/debian/patches/Fix-examples-target.patch
deleted file mode 100644
index 19db980..0000000
--- a/debian/patches/Fix-examples-target.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Sun, 22 Nov 2015 17:09:41 +0000
-Subject: Fix examples target.
-
----
- examples/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 8b2a7b3..5bbc6be 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -130,10 +130,10 @@ else()
- MESSAGE(STATUS "EXAMPLES: OPENCL backend is OFF. OPENCL was not found")
- endif()
-
--INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-+INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/"
- DESTINATION "${AF_INSTALL_EXAMPLE_DIR}"
- COMPONENT examples)
-
- INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../assets/examples"
-- DESTINATION "${AF_INSTALL_EXAMPLE_DIR}/examples/assets/"
-+ DESTINATION "${AF_INSTALL_EXAMPLE_DIR}/assets/"
- )
diff --git a/debian/patches/Fix-missing-cstdio-include.patch b/debian/patches/Fix-missing-cstdio-include.patch
deleted file mode 100644
index 82a7b79..0000000
--- a/debian/patches/Fix-missing-cstdio-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Sun, 22 Nov 2015 15:23:29 +0000
-Subject: Fix missing cstdio include.
-
----
- examples/unified/basic.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/examples/unified/basic.cpp b/examples/unified/basic.cpp
-index 31d1eac..72521a6 100644
---- a/examples/unified/basic.cpp
-+++ b/examples/unified/basic.cpp
-@@ -10,6 +10,7 @@
- #include <arrayfire.h>
- #include <vector>
- #include <algorithm>
-+#include <cstdio>
-
- using namespace af;
-
diff --git a/debian/patches/Fix-missing-includes-in-testsuite.patch b/debian/patches/Fix-missing-includes-in-testsuite.patch
new file mode 100644
index 0000000..f44764f
--- /dev/null
+++ b/debian/patches/Fix-missing-includes-in-testsuite.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 8 Dec 2015 08:47:07 +0000
+Subject: Fix missing includes in testsuite.
+
+---
+ test/testHelpers.hpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/testHelpers.hpp b/test/testHelpers.hpp
+index e982e90..cd725fe 100644
+--- a/test/testHelpers.hpp
++++ b/test/testHelpers.hpp
+@@ -13,6 +13,8 @@
+ #include <vector>
+ #include <algorithm>
+ #include <limits>
++#include <stdexcept>
++#include <cfloat>
+ #include <arrayfire.h>
+ #include <af/dim4.hpp>
+ #include <af/array.h>
diff --git a/debian/patches/Use-custom-cflags-in-examples.patch b/debian/patches/Use-custom-cflags-in-examples.patch
index 1cb9034..0c2d481 100644
--- a/debian/patches/Use-custom-cflags-in-examples.patch
+++ b/debian/patches/Use-custom-cflags-in-examples.patch
@@ -6,11 +6,9 @@ Subject: Use custom cflags in examples.
examples/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index a795916..8b2a7b3 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
-@@ -34,8 +34,8 @@ IF(WIN32)
+@@ -36,8 +36,8 @@
SET(CMAKE_CXX_FLAGS "/we4996")
SET(CMAKE_C_FLAGS "/we4996")
ELSE(WIN32)
diff --git a/debian/patches/Use-system-gtest.patch b/debian/patches/Use-system-gtest.patch
index e10404c..98198a7 100644
--- a/debian/patches/Use-system-gtest.patch
+++ b/debian/patches/Use-system-gtest.patch
@@ -6,16 +6,13 @@ Subject: Use system gtest.
CMakeModules/build_gtest.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/CMakeModules/build_gtest.cmake b/CMakeModules/build_gtest.cmake
-index 4d7fbbe..f9dec19 100644
---- a/CMakeModules/build_gtest.cmake
-+++ b/CMakeModules/build_gtest.cmake
-@@ -50,7 +50,8 @@ ExternalProject_Add(
+--- a/test/CMakeModules/build_gtest.cmake
++++ b/test/CMakeModules/build_gtest.cmake
+@@ -51,7 +51,7 @@
${BUILD_NAME}
# URL http://googletest.googlecode.com/files/gtest-1.7.0.zip
# URL_MD5 2d6ec8ccdf5c46b05ba54a9fd1d130d7
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../test/gtest"
-+ DOWNLOAD_COMMAND ""
+ SOURCE_DIR "/usr/src/gtest"
PREFIX ${prefix}
BINARY_DIR ${BUILD_BINARY_DIR}
diff --git a/debian/patches/series b/debian/patches/series
index ba828ea..3a70cfd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,4 @@ Disable-privacy-breaching-settings.patch
Fix-CBLAS-detection.patch
Use-system-gtest.patch
Use-custom-cflags-in-examples.patch
-Fix-missing-cstdio-include.patch
-Fix-documentation-target.patch
-Fix-examples-target.patch
+Fix-missing-includes-in-testsuite.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list