[clfft] 01/02: d/p: add patch disabling multilib cflags
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Jun 18 08:57:55 UTC 2015
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 f62412ae8fad50f61d4c5cd12b811f11e85866ca
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu Jun 18 09:36:12 2015 +0100
d/p: add patch disabling multilib cflags
---
.../patches/disable-multilib-compile-flags.patch | 23 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 24 insertions(+)
diff --git a/debian/patches/disable-multilib-compile-flags.patch b/debian/patches/disable-multilib-compile-flags.patch
new file mode 100644
index 0000000..f13b52b
--- /dev/null
+++ b/debian/patches/disable-multilib-compile-flags.patch
@@ -0,0 +1,23 @@
+--- clfft.orig/src/CMakeLists.txt
++++ clfft/src/CMakeLists.txt
+@@ -214,13 +214,13 @@
+ 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( 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")
diff --git a/debian/patches/series b/debian/patches/series
index 5ef37e3..1d8ebe3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-cmake-config-install.patch
fix-doxygen-settings.patch
fix-client-name.patch
debian-enable-multiarch.patch
+disable-multilib-compile-flags.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