From: IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>
Date: Wed, 22 Dec 2021 13:25:23 +0000 (+0100)
Subject: Fix typo in fix for MIPS build failure
X-Git-Tag: archive/raspbian/6.1.5_ds0-1+rpi1^2~28
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b7d993028c646131281cab52e3ea4234f22560c5;p=juce.git

Fix typo in fix for MIPS build failure

also simplify detection of no-atomic archs...
---

diff --git a/debian/rules b/debian/rules
index 69b2d383..d2eb29f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ export DEB_LDFLAGS_MAINT_APPEND =
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 include /usr/share/dpkg/buildtools.mk
+include /usr/share/dpkg/architecture.mk
 
 DEBIAN_BUILD_ARTIFACTS = debian/artifacts
 
@@ -29,15 +30,14 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \
 # - https://gcc.gnu.org/wiki/Atomic
 # - https://gcc.gnu.org/wiki/Atomic/GCCMM/LIbrary
 # - the 'clasp' packaging
-noatomicarch = $(shell dpkg-architecture -qDEB_HOST_ARCH | egrep -x "(armel|powerpc|powerpcspe|m68k|mips|mipsel|sh4|riscv64)")
 # link with libatomic on architectures without built-in atomic
-ifeq ($(if $(noatomicarch),atomic), atomic)
+ifneq ($(strip $(filter $(DEB_HOST_ARCH), armel powerpc powerpcspe m68k mips mipsel sh4 riscv64)),)
 	DEB_CPPFLAGS_MAINT_APPEND += -DDEBIAN_JUCERPROJECT_LIBS='"atomic"'
 	DEB_LDFLAGS_MAINT_APPEND += -latomic
 endif
 
-
-ifneq ($(strip $(filter $(arch), mipsel mips64el)),)
+# we got too many symbols for MIPS, so we need to enablea workaround...
+ifneq ($(strip $(filter $(DEB_HOST_ARCH), mipsel mips64el)),)
 	DEB_CXXFLAGS_MAINT_APPEND += -mxgot
 endif