aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-05-15 13:22:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-05-15 13:22:17 +0000
commitaef4fe0438c3c48d9014e81d7d51dd22a461b001 (patch)
tree60f377a24b4b30acb2e6d99f54db98467cb4bc6f
parentfe3b0085969fc9f402c2f4233bfbf8e655e25b26 (diff)
downloadspec-helper-aef4fe0438c3c48d9014e81d7d51dd22a461b001.tar
spec-helper-aef4fe0438c3c48d9014e81d7d51dd22a461b001.tar.gz
spec-helper-aef4fe0438c3c48d9014e81d7d51dd22a461b001.tar.bz2
spec-helper-aef4fe0438c3c48d9014e81d7d51dd22a461b001.tar.xz
spec-helper-aef4fe0438c3c48d9014e81d7d51dd22a461b001.zip
strip_and_check_elf_files: skip check on /usr/lib/debug (#40847)
-rw-r--r--NEWS2
-rwxr-xr-xstrip_and_check_elf_files14
2 files changed, 10 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 96843e2..47be836 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+ * strip_and_check_elf_files: skip check on /usr/lib/debug (#40847)
+
2008-05-14 Guillaume Rousse <guillomovitch@mandriva.org> 0.29.3
* fix regression related to symlinks introduced in previous release
(spotted by Anssi)
diff --git a/strip_and_check_elf_files b/strip_and_check_elf_files
index e5e2490..0870e99 100755
--- a/strip_and_check_elf_files
+++ b/strip_and_check_elf_files
@@ -19,12 +19,13 @@ strip_files() if !$ENV{DONT_STRIP};
check_missing_or_unused_libs();
sub strip_files {
- my $exclude_pattern = join('|',
- map { '(:?' . quotemeta($_) . ')' }
- $ENV{EXCLUDE_FROM_STRIP} ? split(' ', $ENV{EXCLUDE_FROM_STRIP}) : (),
- '/usr/lib/debug'
- );
- my @to_strip = grep { !/$exclude_pattern/ } @shared_libs, @executables;
+ my @to_strip = (@shared_libs, @executables);
+
+ if ($ENV{EXCLUDE_FROM_STRIP}) {
+ my $exclude_pattern = join('|',
+ map { '(:?' . quotemeta($_) . ')' } split(' ', $ENV{EXCLUDE_FROM_STRIP}));
+ @to_strip = grep { !/$exclude_pattern/ } @to_strip;
+ }
system(
"strip",
@@ -61,6 +62,7 @@ sub keep_wanted() {
return unless -f $_;
# skip symlinks
return if -l $_;
+ return if $File::Find::dir =~ m!/usr/lib/debug($|/)!;
# Does its filename look like a shared library?
if (m/\.so/) {