From c1f965684b54bed51e8cb1e7a2f3d2003d64d341 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 24 Nov 2015 18:30:05 +0000 Subject: Do much less work in architecture-independent-only builds. --- debian/rules | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index d6b1b101a..148eed209 100755 --- a/debian/rules +++ b/debian/rules @@ -127,14 +127,18 @@ autoreconf: autoreconf -f -i cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./ -override_dh_autoreconf: +override_dh_autoreconf-arch: dh_autoreconf debian/rules -- autoreconf -override_dh_auto_configure: +override_dh_autoreconf-indep: + +override_dh_auto_configure-arch: dh_auto_configure -Bbuild-deb -- $(confflags) dh_auto_configure -Bbuild-udeb -- $(confflags_udeb) -override_dh_auto_build: +override_dh_auto_configure-indep: + +override_dh_auto_build-arch: # Avoid libnsl linkage. Ugh. perl -pi -e 's/ +-lnsl//' build-udeb/config.status cd build-udeb && ./config.status @@ -144,7 +148,9 @@ override_dh_auto_build: $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG) -override_dh_auto_test: +override_dh_auto_build-indep: + +override_dh_auto_test-arch: ifeq ($(RUN_TESTS),yes) $(MAKE) -C build-deb regress-prep $(MAKE) -C build-deb $(PARALLEL) \ @@ -161,6 +167,8 @@ ifeq ($(RUN_TESTS),yes) $(MAKE) -C debian/keygen-test endif +override_dh_auto_test-indep: + override_dh_auto_clean: rm -rf build-deb build-udeb ifeq ($(RUN_TESTS),yes) @@ -170,9 +178,11 @@ endif (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \ > debian/copyright -override_dh_auto_install: +override_dh_auto_install-arch: $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys +override_dh_auto_install-indep: + override_dh_install-arch: rm -f debian/tmp/etc/ssh/sshd_config @@ -186,9 +196,12 @@ override_dh_install-arch: debian/openssh-client/etc/ssh/moduli \ debian/openssh-client/etc/ssh/ssh_config +# We'd like to use dh_install --fail-missing here, but that doesn't work +# well in combination with dh-exec: it complains that files generated by +# dh-exec for architecture-dependent packages aren't installed. override_dh_install-indep: rm -f debian/tmp/etc/ssh/sshd_config - dh_install --fail-missing + dh_install override_dh_installdocs: dh_installdocs -Nopenssh-server -Nopenssh-sftp-server -- cgit v1.2.3