From: Mike Frysinger Date: Tue, 7 Dec 2004 02:36:58 +0000 (+0000) Subject: Fix /lib vs /lib64 logic. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37b0d56c23d06027bfaf5578552d53f59ed19d1f;p=gentoo.git Fix /lib vs /lib64 logic. --- diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 2ca96df610f9..83b5184881be 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,14 @@ # ChangeLog for sys-apps/baselayout # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.193 2004/12/04 16:11:38 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.194 2004/12/07 02:36:58 vapier Exp $ # See the gentoo-src rc-scripts ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup + 06 Dec 2004; Mike Frysinger + baselayout-1.11.7-r2.ebuild: + Fix /lib vs /lib64 logic. + *baselayout-1.11.7-r2 (04 Dec 2004) 04 Dec 2004; Aron Griffis diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index a29dbbd84918..f2aa2ec335c0 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,17 +1,27 @@ -MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 51eda172b73463b8b53be2417b73053d ChangeLog 43946 +MD5 757faa7ef3f4c0edbaeac5f07079b51b baselayout-1.11.7-r2.ebuild 15735 MD5 5a6e60d4a0e6baf8f051488786595d0c baselayout-1.9.4-r6.ebuild 16833 -MD5 759fa7f2afcf68627b8e0e1c35a722af ChangeLog 43838 +MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385 MD5 14278861a1ae53f620f07c07e168ac8c baselayout-1.11.6-r1.ebuild 16524 -MD5 00c58b0d7beeda075f56a1c1421d3c27 baselayout-1.11.7-r2.ebuild 16596 -MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443 +MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 +MD5 17086158a470fb1a8cf207c8f97f5a6f files/rc-scripts-1.6.7-fix-runscript.patch 493 +MD5 9933f0b4a90470585f9cee5372ac4d02 files/digest-baselayout-1.11.7-r2 69 MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206 +MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443 MD5 adc667ea815b256d6f39259f4134f6df files/sysvinit-2.84-selinux1.patch 3556 -MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 +MD5 0ba12277a13275a24b5754c0a89010bb files/rc-scripts-1.6.7-dhclient.patch 433 +MD5 ab2cacf47e6d0e69a8d1eb729c840a29 files/rc-scripts-1.6.7-udhcpc.patch 653 MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251 MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134 MD5 3d1b5592b9b3398edb36d29422dc0143 files/rc-scripts-1.4.16-livecd.patch 672 MD5 91e3a9eebc03ba2f2d2226ee4f78a177 files/digest-baselayout-1.11.6-r1 69 -MD5 17086158a470fb1a8cf207c8f97f5a6f files/rc-scripts-1.6.7-fix-runscript.patch 493 -MD5 0ba12277a13275a24b5754c0a89010bb files/rc-scripts-1.6.7-dhclient.patch 433 -MD5 ab2cacf47e6d0e69a8d1eb729c840a29 files/rc-scripts-1.6.7-udhcpc.patch 653 -MD5 9933f0b4a90470585f9cee5372ac4d02 files/digest-baselayout-1.11.7-r2 69 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.9.10 (GNU/Linux) + +iD8DBQFBtRdXroRuSHgZdywRAmnQAJ9oM9kQWKzOtAMJp/tnPpkA9dfSVQCfel8V +kvYBRhXjYVULWneliUfEbBs= +=suTq +-----END PGP SIGNATURE----- diff --git a/sys-apps/baselayout/baselayout-1.11.7-r2.ebuild b/sys-apps/baselayout/baselayout-1.11.7-r2.ebuild index 2bf7db9361c4..af99a98d2e07 100644 --- a/sys-apps/baselayout/baselayout-1.11.7-r2.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.7-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.7-r2.ebuild,v 1.1 2004/12/04 16:11:38 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.7-r2.ebuild,v 1.2 2004/12/07 02:36:58 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -113,6 +113,11 @@ unkdir() { } src_install() { + local libdir=$(get_libdir) other_libdir + [[ ${libdir} = "lib" ]] \ + && other_libdir="lib64" \ + || other_libdir="lib" + # This directory is to stash away things that will be used in # pkg_postinst; it's needed first for kdir to function dodir /usr/share/baselayout @@ -133,20 +138,13 @@ src_install() { kdir /etc/modules.d kdir /etc/opt kdir /home - # Explanation below - if [[ ${ARCH} == amd64 ]]; then - kdir /lib64 - kdir /lib64/dev-state - kdir /lib64/udev-state - else - kdir /lib - kdir /lib/dev-state - kdir /lib/udev-state - fi - kdir /lib/rcscripts/awk - kdir /lib/rcscripts/sh - dodir /lib/rcscripts/net.modules.d # .keep file messes up net.lo - dodir /lib/rcscripts/net.modules.d/helpers.d + kdir ${libdir} + kdir ${libdir}/dev-state + kdir ${libdir}/udev-state + kdir ${libdir}/rcscripts/awk + kdir ${libdir}/rcscripts/sh + dodir ${libdir}/rcscripts/net.modules.d # .keep file messes up net.lo + dodir ${libdir}/rcscripts/net.modules.d/helpers.d kdir /mnt kdir -m 0700 /mnt/cdrom kdir -m 0700 /mnt/floppy @@ -161,12 +159,7 @@ src_install() { kdir /usr/include kdir /usr/include/asm kdir /usr/include/linux - # Explanation below - if [[ ${ARCH} == amd64 ]]; then - kdir /usr/lib64 - else - kdir /usr/lib - fi + kdir /usr/${libdir} kdir /usr/local/bin kdir /usr/local/games kdir /usr/local/lib @@ -184,11 +177,7 @@ src_install() { kdir /usr/src kdir /usr/X11R6/include/GL kdir /usr/X11R6/include/X11 - if [[ ${ARCH} == amd64 ]]; then - kdir /usr/X11R6/lib64 - else - kdir /usr/X11R6/lib - fi + kdir /usr/X11R6/${libdir} kdir /usr/X11R6/man kdir /usr/X11R6/share kdir -m 1777 /tmp @@ -204,25 +193,10 @@ src_install() { # Symlinks so that LSB compliant apps work # /lib64 is especially required since its the default place for ld.so - if [[ ${ARCH} == ppc64 ]]; then - dosym lib /lib64 - dosym lib /usr/lib64 - dosym lib /usr/X11R6/lib64 - elif [[ ${ARCH} == amd64 ]]; then - # AMD64 is making a slow move towards actual FHS compliance and multilib - # capabilities (without ugly semi-working lib32 hacks). - # - # During the first stage of migration, we just want to get rid of the - # lib64 symlink. we can do this now by making lib the symlink instead. - # that way, later on when we want to use lib for 32bit libraries, we - # wont have to risk breaking all installed binaries by removing the - # lib64 symlink. (See about note regarding ld.so) Note that this has - # no effect on current installs, just new stages. (07 Aug 2004 lv) - dosym lib64 /lib - dosym lib64 /usr/lib - # X is pretty dumb, i dont know if this'll work when we start removing - # lib symlinks. ^^; we might end up needing to keep this one around... - dosym lib64 /usr/X11R6/lib + if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = amd64 ]] ; then + dosym ${libdir} ${other_libdir} + dosym ${libdir} /usr/${other_libdir} + dosym ${libdir} /usr/X11R6/${other_libdir} # this will eventually exist, so remember to fix it Travis... #dosym ../X11R6/lib64/X11 /usr/lib64/X11 fi