[clfft] 70/109: patch for lib64 removal

Jérôme Kieffer kieffer-guest at moszumanska.debian.org
Wed May 20 07:29:30 UTC 2015


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

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

commit 8604f5a799a565f5cda4dc622ba51b01e1e40999
Author: Jerome Kieffer <jerome.kieffer at terre-adelie.org>
Date:   Thu Apr 9 21:46:09 2015 +0200

    patch for lib64 removal
---
 debian/patches/lib64.patch | 29 +++++++++++++++++++++++++++++
 debian/patches/series      |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/patches/lib64.patch b/debian/patches/lib64.patch
new file mode 100644
index 0000000..4ddc11d
--- /dev/null
+++ b/debian/patches/lib64.patch
@@ -0,0 +1,29 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -48,7 +48,7 @@
+ 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 @@
+ 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 @@
+ 		# 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
index 8ea279e..06e88de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-lib64
+lib64.patch

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



More information about the debian-science-commits mailing list