[med-svn] [iqtree] 04/06: Fix line endings in patch

Andreas Tille tille at debian.org
Wed Jun 29 12:10:31 UTC 2016


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

tille pushed a commit to branch master
in repository iqtree.

commit 1c93d2098b48457ce48b2f9370c22f6c93a31eb6
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jun 29 13:43:46 2016 +0200

    Fix line endings in patch
---
 debian/patches/sse.patch | 56 +++++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/debian/patches/sse.patch b/debian/patches/sse.patch
index 362a11a..db87c83 100644
--- a/debian/patches/sse.patch
+++ b/debian/patches/sse.patch
@@ -5,40 +5,34 @@ Last-Update: Tue, 02 Feb 2016 08:41:45 +0100
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--##################################################################
-+	##################################################################
- # IQ-TREE cmake build definition
- # Copyright (c) 2012-2015 Bui Quang Minh, Lam Tung Nguyen
- ##################################################################
 @@ -172,7 +172,7 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR IQTREE
- 	endif()
- 	SET(EXE_SUFFIX "${EXE_SUFFIX}32")
- 	if (GCC OR CLANG) 
--		set(COMBINED_FLAGS "${COMBINED_FLAGS} -m32")
-+		set(COMBINED_FLAGS "${COMBINED_FLAGS}")
-   	endif()
-     add_definitions(-DBINARY32)
- else()
+ 	endif()
+ 	SET(EXE_SUFFIX "${EXE_SUFFIX}32")
+ 	if (GCC OR CLANG) 
+-		set(COMBINED_FLAGS "${COMBINED_FLAGS} -m32")
++		set(COMBINED_FLAGS "${COMBINED_FLAGS}")
+   	endif()
+     add_definitions(-DBINARY32)
+ else()
 @@ -237,7 +237,7 @@ SET(SSE_FLAGS "")
- if (VCC)
- 	set(SSE_FLAGS "/arch:SSE2 -D__SSE3__")
- elseif (GCC OR CLANG)
--	set(SSE_FLAGS "-msse3")
-+	set(SSE_FLAGS "-msse2")
- elseif (ICC)
- 	if (WIN32)
- 		set(SSE_FLAGS "/arch:SSE3")
+ if (VCC)
+ 	set(SSE_FLAGS "/arch:SSE2 -D__SSE3__")
+ elseif (GCC OR CLANG)
+-	set(SSE_FLAGS "-msse3")
++	set(SSE_FLAGS "-msse2")
+ elseif (ICC)
+ 	if (WIN32)
+ 		set(SSE_FLAGS "/arch:SSE3")
 @@ -273,8 +273,7 @@ elseif (IQTREE_FLAGS MATCHES "avx") # AV
- 
- 	SET(EXE_SUFFIX "${EXE_SUFFIX}-avx")
- else() #SSE intruction set
--	message("Vectorization : SSE3")
--	add_definitions(-D__SSE3)
-+	message("Vectorization : SSE2")
- 
- endif()
- 
+ 
+ 	SET(EXE_SUFFIX "${EXE_SUFFIX}-avx")
+ else() #SSE intruction set
+-	message("Vectorization : SSE3")
+-	add_definitions(-D__SSE3)
++	message("Vectorization : SSE2")
+ 
+ endif()
+ 
 --- a/phylokernel.h
 +++ b/phylokernel.h
 @@ -15,6 +15,10 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/iqtree.git



More information about the debian-med-commit mailing list