[clfft] 105/109: patch to make it work on i386 as well.
Jérôme Kieffer
kieffer-guest at moszumanska.debian.org
Wed May 20 07:29:37 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 85cababca4bf4fa6c23fac07f3bbe40562abc8e9
Author: Jerome Kieffer <kieffer at edna-site.org>
Date: Thu Apr 30 19:04:07 2015 +0200
patch to make it work on i386 as well.
---
debian/patches/lib64.patch | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/debian/patches/lib64.patch b/debian/patches/lib64.patch
index cc632bc..fa610e9 100644
--- a/debian/patches/lib64.patch
+++ b/debian/patches/lib64.patch
@@ -1,5 +1,7 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
+Index: clFFT/src/CMakeLists.txt
+===================================================================
+--- clFFT.orig/src/CMakeLists.txt 2015-04-30 18:53:56.548225962 +0200
++++ clFFT/src/CMakeLists.txt 2015-04-30 18:54:49.429209535 +0200
@@ -115,8 +115,6 @@
if( BUILD64 )
set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE )
@@ -9,4 +11,18 @@
else( )
set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE )
message( STATUS "32bit build - FIND_LIBRARY_USE_LIB64_PATHS FALSE" )
-
+@@ -214,14 +212,6 @@
+ add_definitions( "/D_DEBUG" )
+ endif( )
+
+- if( BUILD64 )
+- set( CMAKE_CXX_FLAGS "-m64 ${CMAKE_CXX_FLAGS}" )
+- set( CMAKE_C_FLAGS "-m64 ${CMAKE_C_FLAGS}" )
+- else( )
+- set( CMAKE_CXX_FLAGS "-m32 ${CMAKE_CXX_FLAGS}" )
+- set( CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" )
+- endif( )
+-
+ if( CODE_COVERAGE )
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
+ set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
--
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