diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-06-29 09:36:28 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-06-29 09:36:28 +0000 |
| commit | d7c7b22025b09d2730a3b4ffadde8d5a50fc3838 (patch) | |
| tree | 1596b3b9b631c64c2fcfaabd7c127f12b8768ae2 | |
| parent | 2acddb63ba8f8353733da924f544089e55c9a265 (diff) | |
| download | drakx-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)
| -rw-r--r-- | perl-install/install2.pm | 1 | ||||
| -rw-r--r-- | perl-install/share/list.xml | 11 | ||||
| -rwxr-xr-x | tools/install-xml-file-list | 5 |
3 files changed, 4 insertions, 13 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 1fab5e8f3..d31a6acae 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -331,7 +331,6 @@ sub main { install_steps_auto_install_non_interactive::errorInStep($o, $msg); }; $ENV{PERL_BADLANG} = 1; - $ENV{LD_ASSUME_KERNEL} = '2.4.1'; delete $ENV{TERMINFO}; umask 022; diff --git a/perl-install/share/list.xml b/perl-install/share/list.xml index 841c6182f..6f2138fb4 100644 --- a/perl-install/share/list.xml +++ b/perl-install/share/list.xml @@ -119,17 +119,6 @@ /usr/share/themes/Galaxy/gtk-2.0/gtkrc /bin/brltty - /lib/tls/libc-2.3.5.so - /lib/tls/libc.so.6 - /lib/tls/libm-2.3.5.so - /lib/tls/libm.so.6 - /lib/tls/libpthread-0.10.so - /lib/tls/libpthread.so.0 - /lib/tls/librt-2.3.5.so - /lib/tls/librt.so.1 - /lib/tls/libthread_db-1.0.so - /lib/tls/libthread_db.so.1 - <from expand="glob"> /etc/brltty/text.*.tbl /etc/brltty/brltty-??.hlp 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 = (); |