[devscripts] 11/18: debuild: Convert debuild's *_APPEND env vars to DEB_*_APPEND

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit b679deb6ce8c0411a757bade77370d2147b1dbce
Author: James McCoy <jamessan at debian.org>
Date:   Sun Nov 20 16:48:58 2016 -0500

    debuild: Convert debuild's *_APPEND env vars to DEB_*_APPEND
    
    (CPPFLAGS|CFLAGS|CXXFLAGS|FFLAGS|LDFLAGS)_APPEND are only recognized by
    debuild.  Since dpkg-buildpackage is doing everything now, convert the
    values to the standard DEB_*_APPEND environment variables.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 scripts/debuild.pl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index e2842d3..daa2b8d 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -992,6 +992,15 @@ if ($command_version eq 'dpkg') {
 	exit 1 unless $ans =~ /^y/i;
     }
 
+    # Convert debuild-specific _APPEND variables to those recognized by
+    # dpkg-buildpackage
+    my @buildflags = qw(CPPFLAGS CFLAGS CXXFLAGS FFLAGS LDFLAGS);
+    foreach my $flag (@buildflags) {
+	if (exists $ENV{"${flag}_APPEND"}) {
+	    $ENV{"DEB_${flag}_APPEND"} = delete $ENV{"${flag}_APPEND"};
+	}
+    }
+
     # We'll need to be a bit cleverer to determine the changes file name;
     # see below
     $build="${pkg}_${sversion}_${arch}.build";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git