aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcheck_elf_files (renamed from strip_and_check_elf_files)17
-rw-r--r--spec-helper.macros.in2
2 files changed, 1 insertions, 18 deletions
diff --git a/strip_and_check_elf_files b/check_elf_files
index 5f7e84d..52c8161 100755
--- a/strip_and_check_elf_files
+++ b/check_elf_files
@@ -21,25 +21,8 @@ $ENV{LD_LIBRARY_PATH}="$buildroot/$lib:$buildroot/usr/$lib";
my (@shared_libs, @executables, @static_libs);
find(\&keep_wanted, $buildroot);
-strip_files() if !$ENV{DONT_STRIP};
check_missing_or_unused_libs();
-sub strip_files {
- my @to_strip = (@shared_libs, @executables);
-
- if ($ENV{EXCLUDE_FROM_STRIP}) {
- my $exclude_pattern = join('|', split(/\s+/, $ENV{EXCLUDE_FROM_STRIP}));
- my $compiled_pattern = qr/($exclude_pattern)/;
- @to_strip = grep { !/$compiled_pattern/ } @to_strip;
- }
-
- system(
- "strip",
- "--remove-section=.comment",
- "--remove-section=.note",
- $_) foreach @to_strip;
-}
-
sub check_missing_or_unused_libs {
my $shift = length($buildroot);
foreach my $file (@shared_libs, @executables) {
diff --git a/spec-helper.macros.in b/spec-helper.macros.in
index 519a7ce..13af2f9 100644
--- a/spec-helper.macros.in
+++ b/spec-helper.macros.in
@@ -14,6 +14,6 @@
%{?!dont_fix_pamd: [ -n "$DONT_FIX_PAMD_CONFIGS" ] || %_spec_helper_dir/fix_pamd} \
%{?!dont_remove_info_dir: [ -n "$DONT_REMOVE_INFO_DIR" ] || %_spec_helper_dir/remove_info_dir} \
%{?!dont_fix_eol: [ -n "$DONT_FIX_EOL" ] || %_spec_helper_dir/fix_eol} \
- DONT_STRIP=%{?dont_strip:1}%{?!dont_strip:"$DONT_STRIP"} %_spec_helper_dir/strip_and_check_elf_files \
+ %{?!dont_check_elf_files: [ -n "$DONT_CHECK_ELF_FILES" ] || %_spec_helper_dir/check_elf_files \
%nil