[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: Apply patch from Steve Langasek to accomodate binutils 2.29 outputting symbols in a different format on ppc64el. (Closes: #869750)



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

lamby pushed a commit to branch master
in repository lintian.

commit 24b1e3374cbc999670a12079dbae9adf8b3f0016
Author: Chris Lamb <lamby@debian.org>
Date:   Fri Jul 28 17:18:23 2017 +0100

    Apply patch from Steve Langasek to accomodate binutils 2.29 outputting symbols in a different format on ppc64el. (Closes: #869750)
---
 debian/changelog                 | 5 +++++
 helpers/coll/objdump-info-helper | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 739e1db..60ed371 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,11 @@ lintian (2.5.53) UNRELEASED; urgency=medium
     + [CL] Apply patch from Maia Everett to avoid British spelling when
       using en_US locale.  (Closes: #868897)
 
+  * helpers/coll/objdump-info-helper:
+    + [CL] Apply patch from Steve Langasek to accomodate binutils 2.29
+      outputting symbols in a different format on ppc64el.
+      (Closes: #869750)
+
  -- Niels Thykier <niels@thykier.net>  Sun, 23 Jul 2017 10:16:35 +0000
 
 lintian (2.5.52) unstable; urgency=medium
diff --git a/helpers/coll/objdump-info-helper b/helpers/coll/objdump-info-helper
index 036b065..42cca58 100755
--- a/helpers/coll/objdump-info-helper
+++ b/helpers/coll/objdump-info-helper
@@ -200,7 +200,7 @@ while (my $line = <$readelf>) {
             push @symbol_versions, $verstring;
         }
     } elsif ($line
-        =~ m/^\s*(\d+):\s*[0-9a-f]+\s+\d+\s+(?:(?:\S+\s+){3})(\S+)\s+(.*)\Z/
+        =~ m/^\s*(\d+):\s*[0-9a-f]+\s+\d+\s+(?:(?:\S+\s+){3})(?:\[.*\]\s+)?(\S+)\s+(.*)\Z/
         and $section eq 'DS') {
         # We (sometimes) need to read the "Version symbols section" first to
         # use this data and readelf tends to print after this section, so

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


Reply to: