[clblas] 52/54: Update patch queue: - Drop Fix-examples-install-target.patch, using dh instead. - Drop add-missing-stdlib-include.patch, applied upstream. - Refresh fix-pthread-linkage.patch.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Jan 14 20:07:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/sid
in repository clblas.
commit e61f8bba4a0e8e245066e4fed540da89df1bb2f5
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu Jan 14 17:05:17 2016 +0000
Update patch queue:
- Drop Fix-examples-install-target.patch, using dh instead.
- Drop add-missing-stdlib-include.patch, applied upstream.
- Refresh fix-pthread-linkage.patch.
---
debian/patches/Fix-examples-install-target.patch | 51 ------------------------
debian/patches/add-missing-stdlib-include.patch | 21 ----------
debian/patches/fix-pthread-linkage.patch | 2 +-
debian/patches/series | 2 -
4 files changed, 1 insertion(+), 75 deletions(-)
diff --git a/debian/patches/Fix-examples-install-target.patch b/debian/patches/Fix-examples-install-target.patch
deleted file mode 100644
index 7901097..0000000
--- a/debian/patches/Fix-examples-install-target.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Tue, 1 Dec 2015 08:21:52 +0000
-Subject: Fix examples install target.
-
----
- src/samples/CMakeLists.txt | 26 +-------------------------
- 1 file changed, 1 insertion(+), 25 deletions(-)
-
-diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt
-index 8422e65..20d9c5c 100644
---- a/src/samples/CMakeLists.txt
-+++ b/src/samples/CMakeLists.txt
-@@ -260,37 +260,13 @@ add_executable(example_sasum ${SASUM_SAMPLE_SRC})
- target_link_libraries(example_sasum ${OPENCL_LIBRARIES} clBLAS)
- set_property( TARGET example_sasum PROPERTY FOLDER "Samples")
-
--# CPack configuration; include the executable into the package
--if( WIN32 )
-- set( CLBLAS_EXAMPLE_INSTALL_DESTINATION bin${SUFFIX_BIN})
--else( )
-- set( CLBLAS_EXAMPLE_INSTALL_DESTINATION share/clBLAS/samples)
--endif()
--install( TARGETS example_sgemm example_sgemv example_ssymv example_ssyrk
-- example_ssyr2k example_strmm example_strsm
-- example_strmv example_strsv example_sger example_cher example_ssyr
-- example_ssyr2 example_cherk example_ssymm example_chemm
-- example_stpmv example_chpmv example_stpsv example_sspmv example_sspr example_chpr
-- example_sspr2 example_zhpr2
-- example_sgbmv example_stbmv example_ssbmv example_chbmv example_stbsv
-- example_cher2k
-- example_sswap example_sscal example_csscal example_scopy example_saxpy example_sdot
-- example_srotg example_srotmg example_srot example_srotm
-- example_snrm2 example_sasum example_isamax
--
-- version
-- RUNTIME DESTINATION ${CLBLAS_EXAMPLE_INSTALL_DESTINATION}
-- LIBRARY DESTINATION lib${SUFFIX_LIB}
-- ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
-- )
--
- configure_file( "${PROJECT_SOURCE_DIR}/samples/CMakeLists.pack"
- "${PROJECT_BINARY_DIR}/samples/CMakeLists.txt" COPYONLY )
-
- if( WIN32 )
- set( CLBLAS_SAMPLE_INSTALL_DESTINATION samples)
- else( )
-- set( CLBLAS_SAMPLE_INSTALL_DESTINATION share/clBLAS/samples/src)
-+ set( CLBLAS_SAMPLE_INSTALL_DESTINATION share/doc/libclblas-doc/examples)
- endif()
-
- install(FILES
diff --git a/debian/patches/add-missing-stdlib-include.patch b/debian/patches/add-missing-stdlib-include.patch
deleted file mode 100644
index 0d85889..0000000
--- a/debian/patches/add-missing-stdlib-include.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Wed, 28 Oct 2015 15:30:41 +0000
-Subject: add missing include on stdlib.h
-
----
- src/library/blas/xtrsm.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/library/blas/xtrsm.cc b/src/library/blas/xtrsm.cc
-index e3bef41..167b41c 100644
---- a/src/library/blas/xtrsm.cc
-+++ b/src/library/blas/xtrsm.cc
-@@ -14,7 +14,7 @@
- * limitations under the License.
- * ************************************************************************/
-
--
-+#include <stdlib.h>
- #include <string.h>
- #include <clBLAS.h>
-
diff --git a/debian/patches/fix-pthread-linkage.patch b/debian/patches/fix-pthread-linkage.patch
index b2bbf3e..aa99529 100644
--- a/debian/patches/fix-pthread-linkage.patch
+++ b/debian/patches/fix-pthread-linkage.patch
@@ -5,7 +5,7 @@ Forwarded: no
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
-@@ -868,6 +868,10 @@
+@@ -888,6 +888,10 @@
set_target_properties( clBLAS PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
target_link_libraries(clBLAS ${OPENCL_LIBRARIES} ${MATH_LIBRARY})
diff --git a/debian/patches/series b/debian/patches/series
index 4235415..3397a4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,3 @@ fix-docs-output.patch
use-system-mathjax.patch
reproducible-build.patch
use-boost-dynamic-libs.patch
-add-missing-stdlib-include.patch
-Fix-examples-install-target.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clblas.git
More information about the debian-science-commits
mailing list