cmake: Pass CPPFLAGS in CFLAGS. Closes: #668813 Thanks, Simon Ruderich for the patch...

[debhelper.git] / dh_strip

diff --git a/dh_strip b/dh_strip
index 5cc68834d5cf4ee307729c9f5a0af4c07c60cdc8..57c45f5c7e5a9786091da07ea450381219c4975a 100755 (executable)
--- a/dh_strip
+++ b/dh_strip
@@ -82,7 +82,7 @@ init(options => {
 });
 
 # This variable can be used to turn off stripping (see Policy).
-if (defined $ENV{DEB_BUILD_OPTIONS} && $ENV{DEB_BUILD_OPTIONS} =~ /nostrip/) {
+if (get_buildoption('nostrip')) {
        exit;
 }
 
@@ -161,12 +161,24 @@ sub make_debug {
        return unless get_file_type($file) =~ /not stripped/;
 
        my ($base_file)=$file=~/^\Q$tmp\E(.*)/;
-       my $debug_path=$desttmp."/usr/lib/debug/".$base_file;
+       my $debug_path;
+       if (! compat(8) && 
+           `readelf -n $file`=~ /^\s+Build ID: ([0-9a-f]{2})([0-9a-f]+)$/m) {
+               $debug_path=$desttmp."/usr/lib/debug/.build-id/$1/$2.debug"
+       }
+       else {
+               $debug_path=$desttmp."/usr/lib/debug/".$base_file;
+       }
        my $debug_dir=dirname($debug_path);
        if (! -d $debug_dir) {
                doit("install", "-d", $debug_dir);
        }
-       doit($objcopy, "--only-keep-debug", $file, $debug_path);
+       if (compat(8)) {
+               doit($objcopy, "--only-keep-debug", $file, $debug_path);
+       }
+       else {
+               doit($objcopy, "--only-keep-debug", "--compress-debug-sections", $file, $debug_path);
+       }
        # No reason for this to be executable.
        doit("chmod", 644, $debug_path);
        return $debug_path;