Bug#820429: libvigraimpex: FTBFS on kfreebsd-i386 and hurd-i386: Assertion failed: Sequence items differ at index 5

[Tobias Frost]

On Sun, 10 Apr 2016 20:25:40 +0200 Tobias Frost <tobi at frost.de> wrote:

I tested below patch on fischer.debian.org; and did not see the error
(tried 4 builds)
In the hope this helps...

--
tobi

Regards.
diff -Nru libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/rules
libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/rules
--- libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/rules  2016-
03-23 20:13:15.000000000 +0000
+++ libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/rules  2016-
04-10 20:12:04.000000000 +0000
@@ -6,11 +6,6 @@
 CXXFLAGS := $(shell env DEB_CXXFLAGS_MAINT_APPEND=-pipe dpkg-
buildflags --get CXXFLAGS; dpkg-buildflags --get CPPFLAGS)
 LDFLAGS := $(shell env DEB_LDFLAGS_MAINT_APPEND='-Wl,--as-needed -Wl,-
z,now' dpkg-buildflags --get LDFLAGS)

-ifeq ($(DEB_HOST_ARCH),i386)
-  CFLAGS += -ffloat-store
-  CXXFLAGS += -ffloat-store
-endif
-
 # support for Ubuntu development
 ifeq ($(DEB_HOST_ARCH),ppc64el)
   CFLAGS := $(subst -O3,-O2,$(CFLAGS))
@@ -29,6 +24,16 @@
   CXXFLAGS += --param ggc-min-expand=20
 endif

+ifneq (,$(filter $(DEB_HOST_ARCH_CPU), i386))
+  CFLAGS += -ffloat-store
+  CXXFLAGS += -ffloat-store
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU), powerpc ppc64 s390x))
+  CFLAGS += -ffp-contract=off
+  CXXFLAGS += -ffp-contract=off
+endif
+
+
 ifneq ($(wildcard
/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
   export CMAKE_INCLUDE_PATH=/usr/include/hdf5/serial
   export CMAKE_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial