[med-svn] r14590 - in trunk/packages/mothur/trunk/debian: . patches

[Aaron M. Ucko]

Author: ucko
Date: 2013-09-05 02:35:59 +0000 (Thu, 05 Sep 2013)
New Revision: 14590

Modified:
   trunk/packages/mothur/trunk/debian/changelog
   trunk/packages/mothur/trunk/debian/patches/makefile.patch
Log:
debian/patches/makefile.patch: Leave off -m64, which ia64 doesn't
support and other 64-bit architectures don't need.  (Closes: #721770.)


Modified: trunk/packages/mothur/trunk/debian/changelog
===================================================================
--- trunk/packages/mothur/trunk/debian/changelog	2013-09-05 02:32:54 UTC (rev 14589)
+++ trunk/packages/mothur/trunk/debian/changelog	2013-09-05 02:35:59 UTC (rev 14590)
@@ -1,8 +1,10 @@
 mothur (1.31.2+dfsg-2) UNRELEASED; urgency=low
 
   * NOT YET RELEASED.
+  * debian/patches/makefile.patch: Leave off -m64, which ia64 doesn't
+    support and other 64-bit architectures don't need.  (Closes: #721770.)
 
- -- Aaron M. Ucko <ucko at debian.org>  Wed, 04 Sep 2013 22:32:40 -0400
+ -- Aaron M. Ucko <ucko at debian.org>  Wed, 04 Sep 2013 22:35:45 -0400
 
 mothur (1.31.2+dfsg-1) unstable; urgency=low
 

Modified: trunk/packages/mothur/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/mothur/trunk/debian/patches/makefile.patch	2013-09-05 02:32:54 UTC (rev 14589)
+++ trunk/packages/mothur/trunk/debian/patches/makefile.patch	2013-09-05 02:35:59 UTC (rev 14590)
@@ -1,6 +1,7 @@
 Author: Steffen Moeller <moeller at debian.org>, Tim Booth <tbooth at ceh.ac.uk>
 Purpose: Comment MAC specific option
-  Set -m64 but not -march=native for 64-bit build
+  Don't bother with any compilation flags, as the defaults are already sane
+  on all architectures (and trying to set -m64 explicitly fails on ia64).
 --- a/makefile
 +++ b/makefile
 @@ -21,14 +21,15 @@ FORTAN_COMPILER = gfortran
@@ -21,18 +22,20 @@
  	
  	#if you using cygwin to build Windows the following line
  	#CXX = x86_64-w64-mingw32-g++
-@@ -38,6 +39,10 @@ ifeq  ($(strip $(64BIT_VERSION)),yes)
+@@ -38,9 +39,11 @@ ifeq  ($(strip $(64BIT_VERSION)),yes)
  
  	#if you are a linux user use the following line
  	#CXXFLAGS += -mtune=native -march=native -m64
 +	# But not if you are trying to make a generic build for
 +	# packaging, because your binary will end up being specific
 +	# to your processor.
-+	CXXFLAGS += -m64
  	
  	CXXFLAGS += -DBIT_VERSION 
-     FORTRAN_FLAGS = -m64
-@@ -120,4 +125,3 @@ install : mothur
+-    FORTRAN_FLAGS = -m64
+ endif
+ 
+ 
+@@ -120,4 +123,3 @@ install : mothur
  clean :
  	@rm -f $(OBJECTS)
  	@rm -f uchime