summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-07-22 17:51:24 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-07-22 17:51:24 +0000
commitb5635e70a872d7b4457f068d538ce6dad26c6317 (patch)
tree1ca0b36d47d6ba4a6f157ab5ccc301510d11225a
parentReleasing debian version 1.6-2. (diff)
downloadzutils-b5635e70a872d7b4457f068d538ce6dad26c6317.tar.xz
zutils-b5635e70a872d7b4457f068d538ce6dad26c6317.zip
Applying patch from Helmut Grohne <helmut@subdivi.de> to fix FTBFS when cross-compiling (Closes: #864636).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rwxr-xr-xdebian/rules8
1 files changed, 7 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules
index 9463946..51ba250 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,16 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/architecture.mk
+
+ifeq ($(origin CXX),default)
+CXX := $(DEB_HOST_GNU_TYPE)-g++
+endif
+
%:
dh ${@}
override_dh_auto_configure:
- LDFLAGS="${LDFLAGS} -static" dh_auto_configure -- --exec-prefix=/
+ LDFLAGS="${LDFLAGS} -static" dh_auto_configure -- --exec-prefix=/ CXX=$(CXX)
override_dh_auto_install:
dh_auto_install -- DESTDIR=$(CURDIR)/debian/zutils