This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=9f007edd106727456f54137d8c31ea49ed330f6b

commit 9f007edd106727456f54137d8c31ea49ed330f6b
Author: Guillem Jover <[email protected]>
AuthorDate: Wed Nov 3 03:36:25 2021 +0100

    dpkg-buildpackage: Add support for terse DEB_BUILD_OPTIONS
    
    Pass «-s» to make via MAKEFLAGS.
---
 scripts/Dpkg/BuildOptions.pm | 2 +-
 scripts/dpkg-buildpackage.pl | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index e03ea320b..2806d1bf4 100644
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -118,7 +118,7 @@ sub set {
     my ($self, $key, $value, $source) = @_;
 
     # Sanity checks
-    if ($key =~ /^(noopt|nostrip|nocheck)$/ && defined($value)) {
+    if ($key =~ /^(terse|noopt|nostrip|nocheck)$/ && defined($value)) {
        $value = undef;
     } elsif ($key eq 'parallel')  {
        $value //= '';
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index d8ca69814..d27bfdce8 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -452,6 +452,11 @@ if (defined $parallel) {
     $build_opts->export();
 }
 
+if ($build_opts->has('terse')) {
+    $ENV{MAKEFLAGS} //= '';
+    $ENV{MAKEFLAGS} .= ' -s';
+}
+
 set_build_profiles(@build_profiles) if @build_profiles;
 
 my $changelog = changelog_parse();

-- 
Dpkg.Org's dpkg

Reply via email to