From: Don Armstrong Date: Sat, 13 Oct 2018 17:08:35 +0000 (-0700) Subject: Fix FTCBFS: Build twice for help2man and cross. (Closes: #902291) X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0b6ad9293f76ab063e2c22ed10fbcac053a348fd;p=unscd.git Fix FTCBFS: Build twice for help2man and cross. (Closes: #902291) --- diff --git a/debian/changelog b/debian/changelog index 0b22710..041247b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ unscd (0.53-2) unstable; urgency=medium * Let systemctl help find the man page. * Switch to HTTPS in the watch file. + [ Thanks to Helmut Grohne] + * Fix FTCBFS: Build twice for help2man and cross. (Closes: #902291) + [ Don Armstrong ] * Integrate patches from Ferenc diff --git a/debian/rules b/debian/rules index c29b815..29c7baf 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/dpkg/architecture.mk +-include /usr/share/dpkg/buildtools.mk +CC_FOR_BUILD ?= $(CC) + %: dh $@ @@ -10,12 +14,15 @@ override_dh_auto_clean: dh_auto_clean override_dh_auto_build: - gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o nscd nscd.c -lsystemd + $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o nscd nscd.c -lsystemd help2man --name 'nscd which does not hang' \ --include debian/help2man \ --no-info \ ./nscd > debian/unscd.man ln -fs unscd.man debian/nscd.man +ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) + $(CC) $(CFLAGS) $(LDFLAGS) -o nscd nscd.c +endif override_dh_auto_install: install -d debian/unscd/usr/sbin/