From 42483234e332769644f29f59fd1df87eff12cfaf Mon Sep 17 00:00:00 2001 From: Henry-Nicolas Tourneur Date: Tue, 10 Nov 2020 14:45:13 +0000 Subject: [PATCH 1/2] d/rules: fix an FTBFS on mips64el with GOT > 64kb --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 8e5b6bd6..05c1d544 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,8 @@ export CARGO_HOME = $(CURDIR)/debian/cargo export DEB_BUILD_MAINT_OPTIONS = hardening=+all +# the below avoids an FTBFS on mips64el with a GOT > 64kb +export RUSTFLAGS = -Ctarget-feature=+xgot distrel := $(shell lsb_release --codename --short) ifneq (,$(filter $(distrel),buster amber)) From 540c4d9c05f3ca7762c7d9edc58c22e6905a1a20 Mon Sep 17 00:00:00 2001 From: Henry-Nicolas Tourneur Date: Tue, 10 Nov 2020 14:57:09 +0000 Subject: [PATCH 2/2] d/rules: export RUSTFLAGS only on architecture that needs it --- debian/rules | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 05c1d544..1eddb6f9 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,10 @@ export CARGO_HOME = $(CURDIR)/debian/cargo export DEB_BUILD_MAINT_OPTIONS = hardening=+all # the below avoids an FTBFS on mips64el with a GOT > 64kb -export RUSTFLAGS = -Ctarget-feature=+xgot +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +ifeq ($(DEB_HOST_ARCH),mips64el) + export RUSTFLAGS = -Ctarget-feature=+xgot +endif distrel := $(shell lsb_release --codename --short) ifneq (,$(filter $(distrel),buster amber))