This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=503ab33b937ced36c154952c026c0f608ae1180e commit 503ab33b937ced36c154952c026c0f608ae1180e Author: Guillem Jover <[email protected]> AuthorDate: Thu Jul 5 05:19:09 2018 +0200 dpkg-buildpackage: Only check for fallback build targets on binary builds If we are not going to build any binary package, there is no point in checking whether we need to run any of the build targets. --- debian/changelog | 2 ++ scripts/dpkg-buildpackage.pl | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1cee622ad..de40e2e23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium for the conffile shell, for easier discoverability. * Fix dpkg-buildpackage option --rules-file parsing. It was trying to parse it as --rules-target, which due to the ordering was a no-op. + * Only check for fallback build targets presence on binary builds in + dpkg-buildpackage. * Architecture support: - Add support for riscv64 CPU. Closes: #822914 Thanks to Manuel A. Fernandez Montecelo <[email protected]> diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index ea2c61a47..64c80635c 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -553,13 +553,14 @@ if (build_has_any(BUILD_SOURCE)) { run_hook('build', build_has_any(BUILD_BINARY)); -# XXX Use some heuristics to decide whether to use build-{arch,indep} targets. -# This is a temporary measure to not break too many packages on a flag day. -build_target_fallback($ctrl); - my $build_types = get_build_options_from_type(); if (build_has_any(BUILD_BINARY)) { + # XXX Use some heuristics to decide whether to use build-{arch,indep} + # targets. This is a temporary measure to not break too many packages + # on a flag day. + build_target_fallback($ctrl); + # If we are building rootless, there is no need to call the build target # independently as non-root. run_cmd(@debian_rules, $buildtarget) if rules_requires_root($binarytarget); -- Dpkg.Org's dpkg
