From cd1b1e2a0b326f89d5e3d9ad529c0878c1027e80 Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Thu, 9 Jun 2011 01:16:56 +0000 Subject: [PATCH] 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.] --- debian/changelog | 10 ++++++---- debian/rules | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1b982c81..0193920c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,18 +2,20 @@ ncbi-blast+ (2.2.25-2) UNRELEASED; urgency=low * 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 Wed, 08 Jun 2011 21:08:44 -0400 + -- Aaron M. Ucko Wed, 08 Jun 2011 21:16:49 -0400 ncbi-blast+ (2.2.25-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 397859c7..a3202ebb 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,11 @@ else 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)} \ -- 2.30.2