Source: rbootd
Version: 2.0-10
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

rbootd fails to cross build from source, because does not use the host
architecture in any way. The attached patch uses dpkg's buildtools.mk to
supply the relevant tools. Please consider applying it. Alternatively
consider switching the package to using debhelper and dh_auto_build.

Helmut
diff -u rbootd-2.0/debian/changelog rbootd-2.0/debian/changelog
--- rbootd-2.0/debian/changelog
+++ rbootd-2.0/debian/changelog
@@ -1,3 +1,10 @@
+rbootd (2.0-10.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Let dpkg's buildtools.mk supply cross tools. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 30 Sep 2019 06:01:52 +0200
+
 rbootd (2.0-10) unstable; urgency=low
 
   * New-Maintainer upload (closes: Bug#465907)
diff -u rbootd-2.0/debian/rules rbootd-2.0/debian/rules
--- rbootd-2.0/debian/rules
+++ rbootd-2.0/debian/rules
@@ -12,15 +12,14 @@
 
 package=rbootd
 
-ARCH  := $(shell dpkg --print-architecture)
-
+include /usr/share/dpkg/buildtools.mk
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 CFLAGS = -g -O2 -Wall $(shell getconf LFS_CFLAGS)
 else
 CFLAGS = -O2 -Wall $(shell getconf LFS_CFLAGS)
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-STRIP = -s
+STRIP_OPT = -s --strip-program=$(STRIP)
 endif
 
 export BASEDIR=$(shell pwd)/debian/tmp
@@ -29,7 +28,7 @@
 
 build:
        $(checkdir)
-       $(MAKE) -f Makefile.linux CFLAGS="$(CFLAGS)" rbootd
+       $(MAKE) -f Makefile.linux CC="$(CC)" CFLAGS="$(CFLAGS)" rbootd
        touch build
 
 clean:
@@ -52,7 +51,7 @@
        install -d debian/tmp
        cd debian/tmp;install -d `cat ../dirs`
        install -d ${BASEDIR}/DEBIAN
-       install -o root -g root -m 0755 $(STRIP) rbootd ${BASEDIR}/usr/sbin
+       install -o root -g root -m 0755 $(STRIP_OPT) rbootd ${BASEDIR}/usr/sbin
        install -o root -g root -m 0644 debian/default 
${BASEDIR}/etc/default/rbootd
        install -o root -g root -m 0755 debian/rbootd.init.d 
${BASEDIR}/etc/init.d/rbootd
        install -o root -g root -m 0644 etc-rbootd/rbootd.conf ${BASEDIR}/etc

Reply via email to