summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-02-08 15:26:28 -0400
committerJoey Hess <joey@kitenet.net>2011-02-08 15:26:28 -0400
commit7bc99d44cfc0275e1b44b390bed1362c457da9ab (patch)
tree2df7ed6493204d8666e3e2a239a553eeddbb623c
parentf19def33cbd70ff149ac11cd44b0936c806a8983 (diff)
parentd687f06403910b86076e821b52ad7a444a781e39 (diff)
merge
-rwxr-xr-xdh_makeshlibs9
-rwxr-xr-xdh_strip19
2 files changed, 22 insertions, 6 deletions
diff --git a/dh_makeshlibs b/dh_makeshlibs
index 045e945..29d3f4d 100755
--- 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}}) {
while (<FIND>) {
my ($library, $major);
push @lib_files, $_;
- 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 3acf6a7..b4098be 100755
--- 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",$_);
}
}