X-Git-Url: https://git.donarmstrong.com/?p=debhelper.git;a=blobdiff_plain;f=dh_strip;h=ea5315a3b12999cd1b63d956f62ffa1b9ca6a9ca;hp=2c667bb74bbc9a93e6cfd03ea5ddc597b3254405;hb=18a0da8092ea9f3dc48bca92b36f592af25a608d;hpb=64cd63ff797a52da5222024a966d6fdb495af6b5 diff --git a/dh_strip b/dh_strip index 2c667bb..ea5315a 100755 --- a/dh_strip +++ b/dh_strip @@ -12,25 +12,25 @@ use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS -B [S>] [B<-X>I] [--dbg-package=package] [--keep-debug] +B [S>] [B<-X>I] [B<--dbg-package=>I] [B<--keep-debug>] =head1 DESCRIPTION -dh_strip is a debhelper program that is responsible for stripping +B is a debhelper program that is responsible for stripping executables, shared libraries, and static libraries that are not used for debugging. This program examines your package build directories and works out what to strip on its own. It uses L and file permissions and filenames -to figure out what files are shared libraries (*.so), executable binaries, -and static (lib*.a) and debugging libraries (lib*_g.a, debug/*.so), and +to figure out what files are shared libraries (F<*.so>), executable binaries, +and static (F) and debugging libraries (F, F), and strips each as much as is possible. (Which is not at all for debugging libraries.) In general it seems to make very good guesses, and will do the right thing in almost all cases. Since it is very hard to automatically guess if a file is a -module, and hard to determine how to strip a module, dh_strip does not -currently deal with stripping binary modules such as .o files. +module, and hard to determine how to strip a module, B does not +currently deal with stripping binary modules such as F<.o> files. =head1 OPTIONS @@ -38,36 +38,36 @@ currently deal with stripping binary modules such as .o files. =item B<-X>I, B<--exclude=>I -Exclude files that contain "item" anywhere in their filename from being +Exclude files that contain I anywhere in their filename from being stripped. You may use this option multiple times to build up a list of things to exclude. =item B<--dbg-package=>I -Causes dh_strip to save debug symbols stripped from the packages it acts on +Causes B to save debug symbols stripped from the packages it acts on as independent files in the package build directory of the specified debugging package. For example, if your packages are libfoo and foo and you want to include a -foo-dbg package with debugging symbols, use dh_strip --dbg-package=foo-dbg. +I package with debugging symbols, use BI. Note that this option behaves significantly different in debhelper compatibility levels 4 and below. Instead of specifying the name of a debug package to put symbols in, it specifies a package (or packages) which should have separated debug symbols, and the separated symbols are placed -in packages with "-dbg" added to their name. +in packages with B<-dbg> added to their name. =item B<-k>, B<--keep-debug> Debug symbols will be retained, but split into an independent -file in usr/lib/debug/ in the package build directory. --dbg-package +file in F in the package build directory. B<--dbg-package> is easier to use than this option, but this option is more flexible. =back =head1 NOTES -If the DEB_BUILD_OPTIONS environment variable contains "nostrip", nothing +If the B environment variable contains B, nothing will be stripped, in accordance with Debian policy (section 10.1 "Binaries"). @@ -82,10 +82,13 @@ 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; } +my $objcopy = cross_command("objcopy"); +my $strip = cross_command("strip"); + # I could just use `file $_[0]`, but this is safer sub get_file_type { my $file=shift; @@ -115,7 +118,8 @@ sub testfile { return if $fn=~m/debug\/.*\.so/; # Does its filename look like a shared library? - if (m/.*\.so.*?/) { + # (*.cmxs are OCaml native code shared libraries) + if (m/.*\.(so.*?|cmxs$)/) { # Ok, do the expensive test. my $type=get_file_type($_); if ($type=~m/.*ELF.*shared.*/) { @@ -139,7 +143,7 @@ sub testfile { if (m/lib.*\.a$/ && ! m/.*_g\.a$/) { # Is it a binary file, or something else (maybe a liner # script on Hurd, for example? I don't use file, because - # file returns a varity of things on static libraries. + # file returns a variety of things on static libraries. if (-B $_) { push @static_libs, $fn; return; @@ -157,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; @@ -171,7 +187,7 @@ sub make_debug { sub attach_debug { my $file=shift; my $debug_path=shift; - doit("objcopy", "--add-gnu-debuglink", $debug_path, $file); + doit($objcopy, "--add-gnu-debuglink", $debug_path, $file); } foreach my $package (@{$dh{DOPACKAGES}}) { @@ -205,21 +221,21 @@ foreach my $package (@{$dh{DOPACKAGES}}) { foreach (@shared_libs) { my $debug_path = make_debug($_, $tmp, $debugtmp) if $keep_debug; # Note that all calls to strip on shared libs - # *must* inclde the --strip-unneeded. - doit("strip","--remove-section=.comment", + # *must* include the --strip-unneeded. + doit($strip,"--remove-section=.comment", "--remove-section=.note","--strip-unneeded",$_); attach_debug($_, $debug_path) if defined $debug_path; } foreach (@executables) { my $debug_path = make_debug($_, $tmp, $debugtmp) if $keep_debug; - doit("strip","--remove-section=.comment", + doit($strip,"--remove-section=.comment", "--remove-section=.note",$_); attach_debug($_, $debug_path) if defined $debug_path; } foreach (@static_libs) { - doit("strip","--strip-debug",$_); + doit($strip,"--strip-debug",$_); } }