[clfft] 02/50: patch cmake-file

[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 clfft.

commit e3bca0a0bb805c6c1709dfd155d90537a21d18cb
Author: Jerome Kieffer <jerome.kieffer at terre-adelie.org>
Date:   Tue Apr 7 21:23:16 2015 +0200

    patch cmake-file
---
 debian/clfft2.install |  1 +
 debian/control        |  6 +++---
 debian/patches/lib64  | 38 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series |  1 +
 debian/rules          |  4 +++-
 src/CMakeLists.txt    |  6 ++----
 6 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/debian/clfft2.install b/debian/clfft2.install
new file mode 100644
index 0000000..d0dbfd1
--- /dev/null
+++ b/debian/clfft2.install
@@ -0,0 +1 @@
+usr/lib/lib*.so.*
diff --git a/debian/control b/debian/control
index 710fcf6..9c9d96e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: clfft
 Priority: extra
 Maintainer: Jerome Kieffer <jerome.kieffer at esrf.fr>
-Build-Depends: debhelper (>= 9), cmake
+Build-Depends: debhelper (>= 9), cmake, opencl-icd, ocl-icd-dev
 Standards-Version: 3.9.4
 Section: libs
 Homepage: https://github.com/clMathLibraries/clFFT
@@ -11,7 +11,7 @@ Homepage: https://github.com/clMathLibraries/clFFT
 Package: clfft-dev
 Section: libdevel
 Architecture: any
-Depends: clfft2 (= ${binary:Version})
+Depends: clfft2 (= ${binary:Version}), ocl-icd-dev
 Description: clFFT is an open source OpenCL library implementation of FFT
  The FFT is an implementation of the Discrete Fourier Transform (DFT) that
  makes use of symmetries in the FFT definition to reduce the mathematical
@@ -26,7 +26,7 @@ Description: clFFT is an open source OpenCL library implementation of FFT
 Package: clfft2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, opencl-icd
 Description: clFFT is an open source OpenCL library implementation of FFT
  The FFT is an implementation of the Discrete Fourier Transform (DFT) that
  makes use of symmetries in the FFT definition to reduce the mathematical
diff --git a/debian/patches/lib64 b/debian/patches/lib64
new file mode 100644
index 0000000..fc6ae20
--- /dev/null
+++ b/debian/patches/lib64
@@ -0,0 +1,38 @@
+Description: remove installation to lib64
+ .
+ clfft (2.4.0-1) unstable; urgency=low
+ .
+   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+Author: Jerome Kieffer <jerome.kieffer at esrf.fr>
+
+Last-Update: <2015-04-07>
+
+--- clfft-2.4.0.orig/src/CMakeLists.txt
++++ clfft-2.4.0/src/CMakeLists.txt
+@@ -48,7 +48,7 @@ if( NOT DEFINED CLFFT_VERSION_PATCH )
+ endif( )
+
+ set( CLFFT_VERSION "${CLFFT_VERSION_MAJOR}.${CLFFT_VERSION_MINOR}.${CLFFT_VERSION_PATCH}")
+-
++
+ # This is incremented when the ABI to the library changes
+ set( CLFFT_SOVERSION 2 )
+
+@@ -115,8 +115,6 @@ set( SUFFIX_BIN_DEFAULT "" )
+ if( BUILD64 )
+ 	set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE )
+ 	message( STATUS "64bit build - FIND_LIBRARY_USE_LIB64_PATHS TRUE" )
+-
+-    set( SUFFIX_LIB_DEFAULT "64" )
+ else( )
+ 	set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE )
+ 	message( STATUS "32bit build - FIND_LIBRARY_USE_LIB64_PATHS FALSE" )
+@@ -205,7 +203,7 @@ elseif( CMAKE_COMPILER_IS_GNUCXX )
+ 		# we only want c++0x if we're using gcc 4.5.2
+ 		set( CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}" )
+ 	endif()
+-
++
+ 	set( CMAKE_CXX_FLAGS "-pthread ${CMAKE_CXX_FLAGS}" )
+ 	set( CMAKE_C_FLAGS "-pthread ${CMAKE_C_FLAGS}" )
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8ea279e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lib64
diff --git a/debian/rules b/debian/rules
index b2bc650..76a1136 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,5 +10,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh --buildsystem=cmake --sourcedirectory=src $@
+	dh $@ --sourcedirectory=src
 
+#override_dh_auto_configure:
+#	dh_auto_configure -- -DBUILD_SHARED_LIBS=ON -DBUILD_DEMOS=OFF -DBUILD_EXTRAS=OFF src
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ec5fc4b..919ca99 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,7 +48,7 @@ if( NOT DEFINED CLFFT_VERSION_PATCH )
 endif( )
 
 set( CLFFT_VERSION "${CLFFT_VERSION_MAJOR}.${CLFFT_VERSION_MINOR}.${CLFFT_VERSION_PATCH}")
-	
+
 # This is incremented when the ABI to the library changes
 set( CLFFT_SOVERSION 2 )
 
@@ -115,8 +115,6 @@ set( SUFFIX_BIN_DEFAULT "" )
 if( BUILD64 )
 	set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE )
 	message( STATUS "64bit build - FIND_LIBRARY_USE_LIB64_PATHS TRUE" )
-
-    set( SUFFIX_LIB_DEFAULT "64" )
 else( )
 	set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE )
 	message( STATUS "32bit build - FIND_LIBRARY_USE_LIB64_PATHS FALSE" )
@@ -205,7 +203,7 @@ elseif( CMAKE_COMPILER_IS_GNUCXX )
 		# we only want c++0x if we're using gcc 4.5.2
 		set( CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}" )
 	endif()
-	
+
 	set( CMAKE_CXX_FLAGS "-pthread ${CMAKE_CXX_FLAGS}" )
 	set( CMAKE_C_FLAGS "-pthread ${CMAKE_C_FLAGS}" )
 

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