[med-svn] r15399 - in trunk/packages/dialign-t/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2013-12-02 18:15:54 +0000 (Mon, 02 Dec 2013)
New Revision: 15399

Modified:
   trunk/packages/dialign-t/trunk/debian/changelog
   trunk/packages/dialign-t/trunk/debian/control
   trunk/packages/dialign-t/trunk/debian/patches/prevent_enforcing_arch.patch
   trunk/packages/dialign-t/trunk/debian/rules
Log:
Set conditional sse optimising flags


Modified: trunk/packages/dialign-t/trunk/debian/changelog
===================================================================
--- trunk/packages/dialign-t/trunk/debian/changelog	2013-12-02 17:27:00 UTC (rev 15398)
+++ trunk/packages/dialign-t/trunk/debian/changelog	2013-12-02 18:15:54 UTC (rev 15399)
@@ -1,3 +1,10 @@
+dialign-t (1.0.2-4) UNRELEASED; urgency=low
+
+  * Set conditional sse optimising flags
+    Closes: #729652
+
+ -- Andreas Tille <tille at debian.org>  Mon, 02 Dec 2013 19:10:33 +0100
+
 dialign-t (1.0.2-3) unstable; urgency=low
 
   [ Charles Plessy ]

Modified: trunk/packages/dialign-t/trunk/debian/control
===================================================================
--- trunk/packages/dialign-t/trunk/debian/control	2013-12-02 17:27:00 UTC (rev 15398)
+++ trunk/packages/dialign-t/trunk/debian/control	2013-12-02 18:15:54 UTC (rev 15399)
@@ -5,7 +5,7 @@
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dialign-t/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/dialign-t/trunk/
 Homepage: http://dialign-tx.gobics.de/

Modified: trunk/packages/dialign-t/trunk/debian/patches/prevent_enforcing_arch.patch
===================================================================
--- trunk/packages/dialign-t/trunk/debian/patches/prevent_enforcing_arch.patch	2013-12-02 17:27:00 UTC (rev 15398)
+++ trunk/packages/dialign-t/trunk/debian/patches/prevent_enforcing_arch.patch	2013-12-02 18:15:54 UTC (rev 15399)
@@ -1,6 +1,8 @@
 Author: Andreas Tille <tille at debian.org>
-LastChanged: Wed, 13 Nov 2013 14:12:59 +0100
+Last-Update: Mon, 02 Dec 2013 19:10:33 +0100
+Bug-Debian: http://bugs.debian.org/729652
 Description: Do not enforce i686 architecture
+ Also do not enforce sse except if $(SSEFLAGS) is set properly
 
 --- a/source/Makefile
 +++ b/source/Makefile
@@ -9,7 +11,7 @@
  #CPPFLAGS=-g 
  #CPPFLAGS=-O3 -march=i686 -funroll-loops
 -CPPFLAGS=-O3 -funroll-loops -march=i686 -mfpmath=sse -msse  -mmmx
-+CPPFLAGS=-O3 -funroll-loops -mfpmath=sse -msse  -mmmx
++CPPFLAGS=-O3 -funroll-loops $(SSEFLAGS)
  #CPPFLAGS=-march=athlon-mp -g -O0 -Wall -D_USE_XOPEN -D__unix__
  
  OBJ_DIR=.

Modified: trunk/packages/dialign-t/trunk/debian/rules
===================================================================
--- trunk/packages/dialign-t/trunk/debian/rules	2013-12-02 17:27:00 UTC (rev 15398)
+++ trunk/packages/dialign-t/trunk/debian/rules	2013-12-02 18:15:54 UTC (rev 15399)
@@ -2,6 +2,8 @@
 
 SRCDIR=$(CURDIR)/source
 
+export SSEFLAGS := $(shell if [ `dpkg-architecture -qDEB_BUILD_ARCH` = amd64 -o `dpkg-architecture -qDEB_BUILD_ARCH` = i386 ] ; then echo "-mfpmath=sse -msse -mmmx" ; fi)
+
 %:
 	dh $@ --sourcedirectory=$(SRCDIR) --parallel