[med-svn] [Git][med-team/opensurgsim][master] 2 commits: Turn Adrian's patch into a team upload

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / opensurgsim


Commits:
c219fe91 by Andreas Tille at 2020-06-02T14:45:49+02:00
Turn Adrian's patch into a team upload

- - - - -
d73e8958 by Andreas Tille at 2020-06-02T15:55:00+02:00
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+opensurgsim (0.7.0-11) unstable; urgency=medium
+
+  [ Adrian Bunk ]
+  * Team upload.
+  * 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
+    Closes: #962041
+
+ -- Andreas Tille <tille at debian.org>  Tue, 02 Jun 2020 14:47:05 +0200
+
 opensurgsim (0.7.0-10) unstable; urgency=medium
 
   * Team Upload.


=====================================
debian/rules
=====================================
@@ -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_install:
 
 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



View it on GitLab: https://salsa.debian.org/med-team/opensurgsim/-/compare/89ad84ccf550c987ff4344171bb380cf2cfd2b86...d73e8958e6bd2dc474b50f958f5fd77fa8c4eb49

-- 
View it on GitLab: https://salsa.debian.org/med-team/opensurgsim/-/compare/89ad84ccf550c987ff4344171bb380cf2cfd2b86...d73e8958e6bd2dc474b50f958f5fd77fa8c4eb49
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200602/38b44598/attachment-0001.html>