Source: dbview
Version: 1.0.4-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

dbview cross builds successfully, but the resulting binary packages is
utterly broken, because it contains build architecture binaries. The
attached patch fixes that. Please consider applying it.

Helmut
diff -u dbview-1.0.4/debian/changelog dbview-1.0.4/debian/changelog
--- dbview-1.0.4/debian/changelog
+++ dbview-1.0.4/debian/changelog
@@ -1,3 +1,10 @@
+dbview (1.0.4-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use host tools. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Sat, 09 Jun 2018 22:08:53 +0200
+
 dbview (1.0.4-1) unstable; urgency=low
 
   * Fixed typo in NMU-Disclaimer, thanks to Petter Reinholdtsen (See:
diff -u dbview-1.0.4/debian/rules dbview-1.0.4/debian/rules
--- dbview-1.0.4/debian/rules
+++ dbview-1.0.4/debian/rules
@@ -24,6 +24,9 @@
 version = $(shell grep "^$(package) " debian/changelog|head -1 |sed 
's/.*(\(.*\)\-[^\-]*).*/\1/g')
 revision = $(shell grep "^$(package) " debian/changelog|head -1 |sed 
's/.*([^\-]*\-\(.*\)).*/\1/g')
 
+include /usr/share/dpkg/architecture.mk
+-include /usr/share/dpkg/buildtools.mk
+
 installbin = install -o root -g root -m 755
 installdoc = install -o root -g root -m 644
 
@@ -33,13 +36,13 @@
 CFLAGS = -O2 -Wall
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-STRIP = strip
+STRIP = $(DEB_HOST_GNU_TYPE)-strip
 else
 STRIP = echo
 endif
 
 build:
-       $(MAKE) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pipe"
+       $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -fomit-frame-pointer -pipe"
        touch stamp-build
 
 clean: debclean

Reply via email to