summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorOliver Tappe2007-02-03 17:45:00 +0100
committerOliver Tappe2007-02-03 17:45:00 +0100
commit80afaee2da19af86e884292b6501bf98d23cbd56 (patch)
tree5f46e220aa9c2687e3efa4505d80fd9e777844eb /bin
parent* updated to new layout of repository, from now on this script will always work (diff)
downloadcore-80afaee2da19af86e884292b6501bf98d23cbd56.tar.gz
core-80afaee2da19af86e884292b6501bf98d23cbd56.tar.xz
core-80afaee2da19af86e884292b6501bf98d23cbd56.zip
* fixed problems with regards to extractTranslations.pl
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@675 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'bin')
-rwxr-xr-xbin/slxldd16
1 files changed, 12 insertions, 4 deletions
diff --git a/bin/slxldd b/bin/slxldd
index edc283a7..fb16c9b6 100755
--- a/bin/slxldd
+++ b/bin/slxldd
@@ -191,21 +191,27 @@ sub addLibsForBinary
# determine whether binary is 32- or 64-bit platform
# now find out about needed libs, we first try objdump...
- print STDERR _tr("\ttrying objdump...\n") if $verbose;
+ if ($verbose) {
+ print STDERR _tr("\ttrying objdump...\n");
+ }
my $res = `objdump -p $binary 2>/dev/null`;
if (!$?) {
# find out if rpath is set for binary:
my $rpath;
if ($res =~ m[^\s*RPATH\s*(\S+)]im) {
$rpath = $1;
- print STDERR _tr("\trpath='%s'\n", $rpath) if $verbose;
+ if ($verbose) {
+ print STDERR _tr("\trpath='%s'\n", $rpath);
+ }
}
while($res =~ m[^\s*NEEDED\s*(.+?)\s*$]gm) {
addLib($1, $bitwidth, $rpath);
}
} else {
# ...objdump failed, so we try readelf instead:
- print STDERR _tr("\ttrying readelf...\n") if $verbose;
+ if ($verbose) {
+ print STDERR _tr("\ttrying readelf...\n");
+ }
$res = `readelf -d $binary 2>/dev/null`;
if ($?) {
die _tr("neither objdump nor readelf seems to be installed, giving up!\n");
@@ -214,7 +220,9 @@ sub addLibsForBinary
my $rpath;
if ($res =~ m/Library\s*rpath:\s*\[([^\]]+)/im) {
$rpath = $1;
- print STDERR _tr("\trpath='%s'\n", $rpath) if $verbose;
+ if ($verbose) {
+ print STDERR _tr("\trpath='%s'\n", $rpath);
+ }
}
while($res =~ m{\(NEEDED\)[^\[]+\[(.+?)\]\s*$}gm) {
addLib($1, $bitwidth, $rpath);