From 453d0907917519dd7d1e239327dc7c64b873f074 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Thu, 26 Apr 2007 18:42:52 +0000
Subject: * added workaround for /lib32 and /usr/lib32 not being referenced in 
  ld.so.conf on debian, although they are required and used. I don't  
 understand why they do it this way...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@931 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 bin/slxldd | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'bin')

diff --git a/bin/slxldd b/bin/slxldd
index c84ca513..38b9508f 100755
--- a/bin/slxldd
+++ b/bin/slxldd
@@ -20,9 +20,9 @@ slxldd
     This script reimplements ldd in a way that should work for all
     binary formats supported by the binutils installed on the host system.
 
-    An example: if you have a folder containing an ia64 system, you can
-    invoke this script on a ia32-host in order to determine all the libraries
-    required by a binary of the ia64 target system.
+    An example: if you have a folder containing an x86_64 system, you can
+    invoke this script on a x86_32-host in order to determine all the libraries
+    required by a binary of the x86_64 target system.
 ];
 
 use File::Glob ':globally';
@@ -134,6 +134,16 @@ sub fetchLoaderConfig
 	if (!grep { m[^$rootPath/usr/lib$] } @libFolders) {
 		push @libFolders, "$rootPath/usr/lib";
 	}
+
+	# add lib32-folders for 64-bit Debians, as they do not 
+	# refer those in ld.so.conf (which I find strange...)
+	if (-e '/lib32' && !grep { m[^$rootPath/lib32$]}  @libFolders) {
+		push @libFolders, "$rootPath/lib32";
+	}
+	if (-e '/usr/lib32' 
+	&& !grep { m[^$rootPath/usr/lib32$] } @libFolders) {
+		push @libFolders, "$rootPath/usr/lib32";
+	}
 }
 
 sub addLib
@@ -169,7 +179,7 @@ sub addLib
 			}
 		}
 		if (!defined $libPath) {
-			die _tr("*** unable to find lib %s! ***\n", $lib);
+			die _tr("unable to find lib %s!\n", $lib);
 		}
 		print "$libPath\n";
 		$libInfo{$lib} = $libPath;
-- 
cgit v1.2.3-55-g7522