diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-09-02 16:22:44 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-09-02 16:22:44 +0000 |
| commit | 148d14f5e438251f40e73543ac38a56b42b4a3c3 (patch) | |
| tree | de3c423a75f96dfd36ea210a23d3d8a554adcc6c /tools | |
| parent | 9ce2905f2abe4bbb435428da25201a34c727d108 (diff) | |
| download | drakx-148d14f5e438251f40e73543ac38a56b42b4a3c3.tar drakx-148d14f5e438251f40e73543ac38a56b42b4a3c3.tar.gz drakx-148d14f5e438251f40e73543ac38a56b42b4a3c3.tar.bz2 drakx-148d14f5e438251f40e73543ac38a56b42b4a3c3.tar.xz drakx-148d14f5e438251f40e73543ac38a56b42b4a3c3.zip | |
replace /lib/tls with /lib for libraries collected using collect_needed_libraries
(it was already done for files collected using ldd)
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/install-xml-file-list | 5 |
1 files changed, 5 insertions, 0 deletions
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'); |