Source: mbr
Version: 1.1.11-5.2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
mbr fails to cros build from source, because it configures for the build
architecture. It also forces the build architecture compiler and the
build architecture strip. The attached patch fixes all of that. Please
consider applying it.
Helmut
diff -u mbr-1.1.11/debian/changelog mbr-1.1.11/debian/changelog
--- mbr-1.1.11/debian/changelog
+++ mbr-1.1.11/debian/changelog
@@ -1,3 +1,13 @@
+mbr (1.1.11-5.3) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Pass --host to ./configure.
+ + Let dpkg's buildtools.mk supply $(CC).
+ + Defer all stripping to dh_strip.
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 10 Aug 2018 15:58:31 +0200
+
mbr (1.1.11-5.2) unstable; urgency=medium
* Non-maintainer upload.
diff -u mbr-1.1.11/debian/rules mbr-1.1.11/debian/rules
--- mbr-1.1.11/debian/rules
+++ mbr-1.1.11/debian/rules
@@ -1,8 +1,11 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/architecture.mk
+-include /usr/share/dpkg/buildtools.mk
+
binaries := $(shell dh_listpackages)
-CC := gcc -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+CC := $(CC) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
CFLAGS := -g -Wall -W
INSTALL_PROGRAM := install
@@ -10,9 +13,6 @@
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
build: build-arch build-indep
@@ -21,7 +21,7 @@
build-indep: build-stamp
build-stamp:
- ./configure --exec-prefix=`pwd`/debian/mbr/
--prefix=`pwd`/debian/mbr/usr
+ ./configure --exec-prefix=`pwd`/debian/mbr/
--prefix=`pwd`/debian/mbr/usr --build=$(DEB_BUILD_GNU_TYPE)
--host=$(DEB_HOST_GNU_TYPE)
$(MAKE) CC="$(CC)" LD="$(LD)" CFLAGS="$(CFLAGS)"
touch build
