Use cross-binutils helpers when cross-compiling

dh_strip, dh_makeshlibs: use triplet-objdump, triplet-objcopy and
triplet-strip from cross-binutils when cross-compiling; closes: #412118.

diff --git a/dh_makeshlibs b/dh_makeshlibs
index 03a54f95420d3d990f39ef14c962863730608f18..652def3a2b63226de5fe1c40cbf7caf8c363b37a 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -121,6 +121,13 @@ init(options => {
        "add-udeb=s" => \$dh{SHLIBS_UDEB},
 });
 
+my $od = "objdump";
+# cross-compiling?
+if (dpkg_architecture_value("DEB_BUILD_GNU_TYPE")
+    ne dpkg_architecture_value("DEB_HOST_GNU_TYPE")) {
+       $od=dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-objdump";
+}
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
        next if is_udeb($package);
        
@@ -146,7 +153,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        open (FIND, "find $tmp -type f \\( -name '*.so' -or -name '*.so.*' \\) $exclude |");
        while (<FIND>) {
                my ($library, $major);
-               my $objdump=`objdump -p $_`;
+               my $objdump=`$od -p $_`;
                if ($objdump=~m/\s+SONAME\s+(.+)\.so\.(.+)/) {
                        # proper soname format
                        $library=$1;

diff --git a/dh_strip b/dh_strip
index 0da2e1e772446a32cdbe818ddb10773b6819c2df..d112249883999341e5f32d68fc4a7badcd144902 100755 (executable)
--- a/dh_strip
+++ b/dh_strip
@@ -86,6 +86,15 @@ if (defined $ENV{DEB_BUILD_OPTIONS} && $ENV{DEB_BUILD_OPTIONS} =~ /nostrip/) {
        exit;
 }
 
+my $objcopy = "objcopy";
+my $strip = "strip";
+# cross-compiling?
+if (dpkg_architecture_value("DEB_BUILD_GNU_TYPE")
+    ne dpkg_architecture_value("DEB_HOST_GNU_TYPE")) {
+       $objcopy=dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-objcopy";
+       $strip=dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-strip";
+}
+
 # I could just use `file $_[0]`, but this is safer
 sub get_file_type {
        my $file=shift;
@@ -163,7 +172,7 @@ sub make_debug {
        if (! -d $debug_dir) {
                doit("install", "-d", $debug_dir);
        }
-       doit("objcopy", "--only-keep-debug", $file, $debug_path);
+       doit($objcopy, "--only-keep-debug", $file, $debug_path);
        # No reason for this to be executable.
        doit("chmod", 644, $debug_path);
        return $debug_path;
@@ -172,7 +181,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}}) {
@@ -207,20 +216,20 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                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",
+               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",$_);
        }
 }