[Debian-med-packaging] Bug#962041: opensurgsim: FTBFS on i386/mipsel/mips64el

[Adrian Bunk]

Source: opensurgsim
Version: 0.7.0-10
Severity: serious
Tags: patch

https://buildd.debian.org/status/logs.php?pkg=opensurgsim&ver=0.7.0-10

The patch below contains the following changes:
- fix FTBFS on i386
	 12 - SurgSimMathTest (Failed)
- fix/workaround FTBFS on mipsel
  cc1plus: out of memory allocating 5399924 bytes after a total of 73105408 bytes
- fix/workaround FTBFS on mips64el
  E: Build killed with signal TERM after 150 minutes of inactivity
- stop ignoring test failures on armhf, I haven't seen the error
  in any recent build logs


--- debian/rules.old	2020-05-26 19:34:35.609162184 +0000
+++ debian/rules	2020-05-26 19:34:52.869462911 +0000
@@ -3,10 +3,18 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=-format,+bindnow
 export GOOGLEMOCK_DIR = /usr/src/googletest/googlemock
 
+ifneq (,$(filter $(DEB_HOST_ARCH), i386))
+    export DEB_CXXFLAGS_MAINT_APPEND += -ffloat-store
+endif
+
+ifneq (,$(filter $(DEB_HOST_ARCH), mipsel mips64el))
+    export DEB_CXXFLAGS_MAINT_APPEND += -g1
+endif
+
 %:
 	dh $@
 
-ifeq (,$(filter $(DEB_BUILD_ARCH),i386 arm64 armel armhf powerpc ppc64el ppc64))
+ifeq (,$(filter $(DEB_HOST_ARCH),i386 arm64 armel armhf mipsel powerpc ppc64el ppc64))
     EIGEN_ALIGNMENT=ON
 else
     EIGEN_ALIGNMENT=OFF
@@ -36,12 +44,5 @@
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-ifeq (,$(filter $(DEB_BUILD_ARCH), armhf))
-	@echo "Do normal testing for all architectures except armhf"
 	dh_auto_test
-else
-	@echo "ignore test failures for armhf but leave it as output in the logs"
-	# see https://bugs.debian.org/847321
-	dh_auto_test || true
-endif
 endif