| 1 |
vapier 12/10/02 04:58:30 |
| 2 |
|
| 3 |
Modified: pkg_preinst.eblit |
| 4 |
Log: |
| 5 |
Drop old /lib64 symlink migration as this has not been an issue for years. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha131/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 sys-libs/glibc/files/eblits/pkg_preinst.eblit |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: pkg_preinst.eblit |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- pkg_preinst.eblit 16 Nov 2011 16:07:46 -0000 1.4 |
| 23 |
+++ pkg_preinst.eblit 2 Oct 2012 04:58:30 -0000 1.5 |
| 24 |
@@ -1,57 +1,11 @@ |
| 25 |
-# Copyright 1999-2011 Gentoo Foundation |
| 26 |
+# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.4 2011/11/16 16:07:46 vapier Exp $ |
| 29 |
- |
| 30 |
-fix_lib64_symlinks() { |
| 31 |
- # the original Gentoo/AMD64 devs decided that since 64bit is the native |
| 32 |
- # bitdepth for AMD64, lib should be used for 64bit libraries. however, |
| 33 |
- # this ignores the FHS and breaks multilib horribly... especially |
| 34 |
- # since it wont even work without a lib64 symlink anyways. *rolls eyes* |
| 35 |
- # see bug 59710 for more information. |
| 36 |
- # Travis Tilley <lv@g.o> (08 Aug 2004) |
| 37 |
- if [ -L ${ROOT}/lib64 ] ; then |
| 38 |
- ewarn "removing /lib64 symlink and moving lib to lib64..." |
| 39 |
- ewarn "dont hit ctrl-c until this is done" |
| 40 |
- rm ${ROOT}/lib64 |
| 41 |
- # now that lib64 is gone, nothing will run without calling ld.so |
| 42 |
- # directly. luckily the window of brokenness is almost non-existant |
| 43 |
- use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64 |
| 44 |
- use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64 |
| 45 |
- # all better :) |
| 46 |
- ldconfig |
| 47 |
- ln -s lib64 ${ROOT}/lib |
| 48 |
- einfo "done! :-)" |
| 49 |
- einfo "fixed broken lib64/lib symlink in ${ROOT}" |
| 50 |
- fi |
| 51 |
- if [ -L ${ROOT}/usr/lib64 ] ; then |
| 52 |
- rm ${ROOT}/usr/lib64 |
| 53 |
- mv ${ROOT}/usr/lib ${ROOT}/usr/lib64 |
| 54 |
- ln -s lib64 ${ROOT}/usr/lib |
| 55 |
- einfo "fixed broken lib64/lib symlink in ${ROOT}/usr" |
| 56 |
- fi |
| 57 |
- if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then |
| 58 |
- rm ${ROOT}/usr/X11R6/lib64 |
| 59 |
- mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64 |
| 60 |
- ln -s lib64 ${ROOT}/usr/X11R6/lib |
| 61 |
- einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6" |
| 62 |
- fi |
| 63 |
-} |
| 64 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.5 2012/10/02 04:58:30 vapier Exp $ |
| 65 |
|
| 66 |
eblit-glibc-pkg_preinst() { |
| 67 |
# nothing to do if just installing headers |
| 68 |
just_headers && return |
| 69 |
|
| 70 |
- # PPC64+others may want to eventually be added to this logic if they |
| 71 |
- # decide to be multilib compatible and FHS compliant. note that this |
| 72 |
- # chunk of FHS compliance only applies to 64bit archs where 32bit |
| 73 |
- # compatibility is a major concern (not IA64, for example). |
| 74 |
- |
| 75 |
- # amd64's 2005.0 is the first amd64 profile to not need this code. |
| 76 |
- # 2005.0 is setup properly, and this is executed as part of the |
| 77 |
- # 2004.3 -> 2005.0 upgrade script. |
| 78 |
- # It can be removed after 2004.3 has been purged from portage. |
| 79 |
- { use amd64 || use ppc64; } && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks |
| 80 |
- |
| 81 |
# prepare /etc/ld.so.conf.d/ for files |
| 82 |
mkdir -p "${ROOT}"/etc/ld.so.conf.d |
Archives