From 148d14f5e438251f40e73543ac38a56b42b4a3c3 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 2 Sep 2005 16:22:44 +0000 Subject: replace /lib/tls with /lib for libraries collected using collect_needed_libraries (it was already done for files collected using ldd) --- tools/install-xml-file-list | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list index 4630a89fa..388e03ee5 100755 --- a/tools/install-xml-file-list +++ b/tools/install-xml-file-list @@ -153,6 +153,10 @@ sub collect_needed_perl_files { } elsif (begins_with($f, '/dev/')) { # skip } elsif (begins_with($f, '/')) { + if ($main_node->{attr}{'no-arch-libraries'}) { + #- replace /lib/tls or /lib/i686 with /lib + $f =~ s!^(/lib(64)?/).*?/!$1!; + } $global{$f} = 1; } } @@ -286,6 +290,7 @@ sub install { warn "collect-perl-files $local $to @files ($env->{filter}{command})\n"; my ($local_perl_files, $global_perl_files) = collect_needed_perl_files($local, $to, @files); warn "collect-perl-files gave: ", join(' ', @$local_perl_files), "\n"; +# warn " and: ", join(' ', @$global_perl_files), "\n"; copy_and_filter("$working_dir/$local", "$DEST$to", $local_perl_files, $env->{filter}, '', '--dereference'); copy_and_filter('', $DEST, $global_perl_files, $env->{filter}, '', '--dereference'); -- cgit v1.2.1