Disable optimization on armel to work around #630746

diff --git a/debian/changelog b/debian/changelog
index 96391e1a5a2ad4ba016718cfcbaf65f527675057..8e52de88214e138f2192f5e0d36f159ac26dddc5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openafs (1.6.0~pre6-2) UNRELEASED; urgency=low
 
   * Revert the removal of Doxygen's jquery copy.  This has now been fixed
     in the Doxygen package.
+  * Disable optimization on armel to work around #630746.
 
  -- Russ Allbery <rra@debian.org>  Tue, 28 Jun 2011 20:15:46 -0700
 

diff --git a/debian/rules b/debian/rules
index 73f62006c843cd944c49c19b315832725f565060..4beacc7c16be9cc06ea667d54f25fb7c168991f7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,9 @@ LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     DEBIAN_OPT_FLAGS = --disable-optimize --disable-optimize-lwp
     DEBIAN_KERN_FLAGS = --disable-optimize-kernel
+else ifeq (arm-linux-gnueabi,$(DEB_HOST_GNU_TYPE))
+    DEBIAN_OPT_FLAGS = --disable-optimize --disable-optimize-lwp
+    DEBIAN_KERN_FLAGS = --disable-optimize-kernel
 else
     DEBIAN_OPT_FLAGS =
     DEBIAN_KERN_FLAGS =