[med-svn] r6955 - trunk/packages/ncbi-blast+/trunk/debian

[Aaron M. Ucko]

Author: ucko
Date: 2011-06-09 01:16:56 +0000 (Thu, 09 Jun 2011)
New Revision: 6955

Modified:
   trunk/packages/ncbi-blast+/trunk/debian/changelog
   trunk/packages/ncbi-blast+/trunk/debian/rules
Log:
debian/rules (DEB_CONFIGURE_EXTRA_FLAGS): Limit C++ optimization level to -O
(rather than the default -O2) on mips(el), on which g++ otherwise crashes. :-/
[Also for #629656, which should be safe to close now with any luck.]


Modified: trunk/packages/ncbi-blast+/trunk/debian/changelog
===================================================================
--- trunk/packages/ncbi-blast+/trunk/debian/changelog	2011-06-09 01:08:51 UTC (rev 6954)
+++ trunk/packages/ncbi-blast+/trunk/debian/changelog	2011-06-09 01:16:56 UTC (rev 6955)
@@ -2,18 +2,20 @@
 
   * Team upload.
   * NOT RELEASED YET
-  * Fix several sources of build failures (per #629656):
+  * Fix several sources of build failures (closes: #629656):
     - debian/rules (override_dh_install): Correctly support building only
       architecture-dependent packages.
-      (DEB_CONFIGURE_EXTRA_FLAGS): add --without-caution to override the
+      (DEB_CONFIGURE_EXTRA_FLAGS): Add --without-caution to override the
       upstream build system's reluctance to build shared libraries on the
-      Hurd or kFreeBSD, which it doesn't specifically recognize.
+      Hurd or kFreeBSD, which it doesn't specifically recognize.  Limit C++
+      optimization level to -O (rather than the default -O2) on mips(el),
+      on which g++ otherwise crashes. :-/
     - debian/patches/support_other_cpus (new; committed upstream too):
       build correctly on architectures that wound up defining
       NCBI_SLOW_ATOMIC_SWAP (spuriously in the case of powerpc,
       whose detection the patch fixes as well).
 
- -- Aaron M. Ucko <ucko at debian.org>  Wed, 08 Jun 2011 21:08:44 -0400
+ -- Aaron M. Ucko <ucko at debian.org>  Wed, 08 Jun 2011 21:16:49 -0400
 
 ncbi-blast+ (2.2.25-1) unstable; urgency=low
 

Modified: trunk/packages/ncbi-blast+/trunk/debian/rules
===================================================================
--- trunk/packages/ncbi-blast+/trunk/debian/rules	2011-06-09 01:08:51 UTC (rev 6954)
+++ trunk/packages/ncbi-blast+/trunk/debian/rules	2011-06-09 01:16:56 UTC (rev 6955)
@@ -17,6 +17,11 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --with-optimization
 endif
 
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifeq (,$(findstring mips,$(DEB_HOST_ARCH)))
+DEB_CONFIGURE_EXTRA_FLAGS += CXXFLAGS=-O FAST_CXXFLAGS=-O
+endif
+
 llp=LD_LIBRARY_PATH
 override_dh_auto_configure:
 	cd c++  &&  $(llp)=$(CURDIR)/c++/BUILD/lib$${$(llp)+:$$$(llp)} \