Bug#1010364: libffi overrides DEB_BUILD_OPTIONS=nocheck

[Helmut Grohne <helmut@subdivi.de>]

Source: libffi
Version: 3.4.2-4
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

Hi Matthias,

I see that you made libffi override DEB_BUILD_OPTIONS=nocheck in certain
situations. I think your override is too broad as it also covers cross
builds. I'm attaching a patch that narrows down your override to native
builds only and I think it still covers the intended use (as you
explained in the commend). What do you think?

Helmut

diff --minimal -Nru libffi-3.4.2/debian/changelog libffi-3.4.2/debian/changelog
--- libffi-3.4.2/debian/changelog	2022-01-17 11:37:08.000000000 +0100
+++ libffi-3.4.2/debian/changelog	2022-04-29 17:59:05.000000000 +0200
@@ -1,3 +1,10 @@
+libffi (3.4.2-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Don't override DEB_BUILD_OPTIONS=nocheck for cross builds. Closes: #-1.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Fri, 29 Apr 2022 17:59:05 +0200
+
 libffi (3.4.2-4) unstable; urgency=medium
 
   * Configure --without-gcc-arch. Closes: #995223.
diff --minimal -Nru libffi-3.4.2/debian/rules libffi-3.4.2/debian/rules
--- libffi-3.4.2/debian/rules	2022-01-17 11:37:06.000000000 +0100
+++ libffi-3.4.2/debian/rules	2022-04-29 17:59:03.000000000 +0200
@@ -26,7 +26,7 @@
   with_check = yes
 else
   # override buildd admins to run the testsuite anyway ...
-  ifneq (,$(filter $(DEB_HOST_ARCH), m68k powerpcspe sh4))
+  ifeq ($(DEB_BUILD_ARCH),$(filter $(DEB_HOST_ARCH), m68k powerpcspe sh4))
     with_check = yes
   endif
 endif