summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgregor herrmann <gregoa@debian.org>2021-11-12 16:52:00 +0100
committergregor herrmann <gregoa@debian.org>2021-11-12 16:52:00 +0100
commit0b3489c792c76e7b105d93e9da1653920e0f5bb3 (patch)
tree91805b341de670e611449a472b8008bf77730513
parent375cbe71b0b1db650422c8f50bd508e6e43495de (diff)
debian/rules: use /usr/share/dpkg/architecture.mk
instead of calling dpkg-architecture.
-rwxr-xr-xdebian/rules7
1 files changed, 4 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules
index 7400b65..c3e1636 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,15 @@ export DBD_FIREBIRD_REQUIRE_EMBEDDED=1
export AUTOMATED_TESTING=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-BAD_ARCH = kfreebsd-amd64 kfreebsd-i386 armel armhf arm64
+include /usr/share/dpkg/architecture.mk
-ifneq (,$(shell for a in $(BAD_ARCH); do dpkg-architecture -e$$a && echo bad$$a; done))
+BAD_ARCH = kfreebsd-amd64 kfreebsd-i386 armel armhf arm64
+ifneq (,$(filter $(DEB_HOST_ARCH), $(BAD_ARCH)))
export DBD_FIREBIRD_TEST_SKIP_EVENTS_FORK=1
endif
export FIREBIRD_INCLUDE=/usr/include
-export FIREBIRD_LIB=/usr/lib/$(shell dpkg-architecture -q DEB_BUILD_MULTIARCH)
+export FIREBIRD_LIB=/usr/lib/$(DEB_BUILD_MULTIARCH)
export FIREBIRD_HOME=$(FIREBIRD_LIB)
%: