[clfft] 63/109: patch lib64

[Jérôme Kieffer]

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

kieffer-guest pushed a commit to branch debian
in repository clfft.

commit cef30f919bd996ca3f2131bf3f71b31d2ff49e6b
Author: Jerome Kieffer <jerome.kieffer at terre-adelie.org>
Date:   Tue Apr 7 21:34:59 2015 +0200

    patch lib64
---
 debian/patches/lib64 | 27 ++++++---------------------
 src/CMakeLists.txt   |  6 ++++--
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/debian/patches/lib64 b/debian/patches/lib64
index fc6ae20..21a499c 100644
--- a/debian/patches/lib64
+++ b/debian/patches/lib64
@@ -5,20 +5,13 @@ Description: remove installation to lib64
    * 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>
+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 "" )
+Index: clFFT/src/CMakeLists.txt
+===================================================================
+--- clFFT.orig/src/CMakeLists.txt	2015-04-07 21:21:25.000000000 +0200
++++ clFFT/src/CMakeLists.txt	2015-04-07 21:21:25.000000000 +0200
+@@ -115,8 +115,6 @@
  if( BUILD64 )
  	set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE )
  	message( STATUS "64bit build - FIND_LIBRARY_USE_LIB64_PATHS TRUE" )
@@ -27,12 +20,4 @@ Last-Update: <2015-04-07>
  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/src/CMakeLists.txt b/src/CMakeLists.txt
index 919ca99..ec5fc4b 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,6 +115,8 @@ 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" )
@@ -203,7 +205,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