[clblas] 02/10: d/patches: * Remove fix-missing-stdlib.patch, applied upstream. * Remove debian-enable-multiarch.patch, use SUFFIX_LIB cmake option. * Refresh disable-multilib-cflags.patch, fix-pthread-linkage.patch and use-boost-dynamic-libs.patch.

[Ghislain Vaillant]

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 29f9e79a9ecd55f4756719b2bc1975b702dc9a21
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Oct 27 09:39:13 2015 +0000

    d/patches:
      * Remove fix-missing-stdlib.patch, applied upstream.
      * Remove debian-enable-multiarch.patch, use SUFFIX_LIB cmake option.
      * Refresh disable-multilib-cflags.patch, fix-pthread-linkage.patch
        and use-boost-dynamic-libs.patch.
---
 debian/patches/debian-enable-multiarch.patch | 25 ---------------------
 debian/patches/disable-multilib-cflags.patch |  2 +-
 debian/patches/fix-missing-stdlib.patch      | 33 ----------------------------
 debian/patches/fix-pthread-linkage.patch     |  2 +-
 debian/patches/series                        |  2 --
 debian/patches/use-boost-dynamic-libs.patch  |  2 +-
 6 files changed, 3 insertions(+), 63 deletions(-)

diff --git a/debian/patches/debian-enable-multiarch.patch b/debian/patches/debian-enable-multiarch.patch
deleted file mode 100644
index d9a8437..0000000
--- a/debian/patches/debian-enable-multiarch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: enable multiarch installation paths 
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -159,7 +159,7 @@
-     endif( )
- endif()
- 
--set( SUFFIX_LIB ${SUFFIX_LIB_DEFAULT} CACHE STRING "String to append to 'lib' install path" )
-+set( SUFFIX_LIB "/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE STRING "String to append to 'lib' install path" )
- set( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' install path" )
- 
- if( MSVC_IDE )
-@@ -366,7 +366,7 @@
- if(WIN32)
-   set(destdir CMake)
- else()
--  set(destdir lib${SUFFIX_LIB}/cmake/clBLAS)
-+  set(destdir lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/clBLAS)
- endif()
- string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
- configure_file(
diff --git a/debian/patches/disable-multilib-cflags.patch b/debian/patches/disable-multilib-cflags.patch
index 3ec33ed..a7e59d9 100644
--- a/debian/patches/disable-multilib-cflags.patch
+++ b/debian/patches/disable-multilib-cflags.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -293,9 +293,9 @@
+@@ -296,9 +296,9 @@
      # Don't use -rpath.
      set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
  
diff --git a/debian/patches/fix-missing-stdlib.patch b/debian/patches/fix-missing-stdlib.patch
deleted file mode 100644
index 5578935..0000000
--- a/debian/patches/fix-missing-stdlib.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: fix missing inclusion of stdlib within the project
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Bug: https://github.com/clMathLibraries/clBLAS/pull/134
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/library/blas/functor/functor.cc
-+++ b/src/library/blas/functor/functor.cc
-@@ -15,6 +15,7 @@
-  * ************************************************************************/
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <fstream>
- #include <iostream>
- #include <ios>
-@@ -114,4 +115,4 @@
- 
-     }
-   }
--}
-\ No newline at end of file
-+}
---- a/src/library/blas/generic/binary_lookup.cc
-+++ b/src/library/blas/generic/binary_lookup.cc
-@@ -28,7 +28,7 @@
- #include <sys/stat.h>
- 
- #include <devinfo.h>
--
-+#include <stdlib.h>
- 
- 
- 
diff --git a/debian/patches/fix-pthread-linkage.patch b/debian/patches/fix-pthread-linkage.patch
index 9b80c36..b2bbf3e 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
-@@ -490,6 +490,10 @@
+@@ -868,6 +868,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 a46210a..3397a4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
-debian-enable-multiarch.patch
 disable-multilib-cflags.patch
 fix-pthread-linkage.patch
 fix-docs-output.patch
 use-system-mathjax.patch
 reproducible-build.patch
 use-boost-dynamic-libs.patch
-fix-missing-stdlib.patch
diff --git a/debian/patches/use-boost-dynamic-libs.patch b/debian/patches/use-boost-dynamic-libs.patch
index 0718048..57c585d 100644
--- a/debian/patches/use-boost-dynamic-libs.patch
+++ b/debian/patches/use-boost-dynamic-libs.patch
@@ -5,7 +5,7 @@ Forwarded: no
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -267,7 +267,7 @@
+@@ -270,7 +270,7 @@
  
  # Find Boost on the system, and configure the type of boost build we want
  set( Boost_USE_MULTITHREADED ON )

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