summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-06-29 09:36:28 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-06-29 09:36:28 +0000
commitd7c7b22025b09d2730a3b4ffadde8d5a50fc3838 (patch)
tree1596b3b9b631c64c2fcfaabd7c127f12b8768ae2 /tools
parent2acddb63ba8f8353733da924f544089e55c9a265 (diff)
downloaddrakx-d7c7b22025b09d2730a3b4ffadde8d5a50fc3838.tar
drakx-d7c7b22025b09d2730a3b4ffadde8d5a50fc3838.tar.gz
drakx-d7c7b22025b09d2730a3b4ffadde8d5a50fc3838.tar.bz2
drakx-d7c7b22025b09d2730a3b4ffadde8d5a50fc3838.tar.xz
drakx-d7c7b22025b09d2730a3b4ffadde8d5a50fc3838.zip
- have /lib/tls/lib*.so* instead of replacing them with /lib/lib*.so*
otherwise rpm database gets corrupted - don't need setting LD_ASSUME_KERNEL anymore (it wasn't enough, and we now have tls libs)
Diffstat (limited to 'tools')
-rwxr-xr-xtools/install-xml-file-list5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list
index dbe5169a9..f8944ccbd 100755
--- a/tools/install-xml-file-list
+++ b/tools/install-xml-file-list
@@ -128,7 +128,10 @@ sub collect_needed_libraries {
my $to_check = join(' ', @to_check);
my @l = `ldd $to_check 2>/dev/null` =~ m! => (/\S+)!g;
foreach (@l) {
- s!^(/lib(64)?/).*?/!$1! if $main_node->{attr}{'no-arch-libraries'}; #- replace /lib/tls or /lib/i686 with /lib
+ if ($main_node->{attr}{'no-arch-libraries'}) {
+ #- replace /lib/i686 with /lib (but keep /lib/tls)
+ s!^(/lib(64)?/).*?/!$1! if !m!/tls/!;
+ }
}
@to_check = grep { !$needed_libraries{$_}++ } @l;
@to_check = ();