summaryrefslogtreecommitdiff
path: root/dh_makeshlibs
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-12-09 15:08:59 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-12-09 15:08:59 -0500
commitdc8877bbccde87d35d74d48c018ba9e6a106dc29 (patch)
treef4c403f8de8972dacd03e92da513dec32a13d729 /dh_makeshlibs
parentc193b7371fed2f042430f56ec981abf5ff6c0caf (diff)
Revert "dh_makeshlibs: Make -X also exclude libraries from the symbols file. Closes: #557603 (Peter Samuelson)"
This reverts commit a6d3e307da558f6bf455a0d21e1cb9ec1b4fef03. Necessary because it caused a behavior change and broke some package builds.
Diffstat (limited to 'dh_makeshlibs')
-rwxr-xr-xdh_makeshlibs6
1 files changed, 2 insertions, 4 deletions
diff --git a/dh_makeshlibs b/dh_makeshlibs
index 4e4a8e2..03a54f9 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -139,14 +139,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# because only if we can get a library name and a major number from
# objdump is anything actually added.
my $exclude='';
- my (@udeb_lines, @lib_files);
+ my @udeb_lines;
if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
$exclude="! \\( $dh{EXCLUDE_FIND} \\) ";
}
open (FIND, "find $tmp -type f \\( -name '*.so' -or -name '*.so.*' \\) $exclude |");
while (<FIND>) {
my ($library, $major);
- push @lib_files, $_;
my $objdump=`objdump -p $_`;
if ($objdump=~m/\s+SONAME\s+(.+)\.so\.(.+)/) {
# proper soname format
@@ -228,8 +227,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# is not 100% compatible with debhelper. (For example,
# this supports --ignore being used.)
doit("dpkg-gensymbols", "-p$package", "-I$symbols",
- "-P$tmp", (map { "-e$_" } @lib_files),
- @{$dh{U_PARAMS}});
+ "-P$tmp", @{$dh{U_PARAMS}});
if (-s "$tmp/DEBIAN/symbols" == 0) {
doit("rm", "-f", "$tmp/DEBIAN/symbols");
}