diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-07-28 01:43:45 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-07-28 01:43:45 +0000 |
| commit | 9efa896e15e3d69983c4e14a2403650fd53570ce (patch) | |
| tree | 9e2816d56769c42c8b9239994f5435563838e5cd /sys-libs | |
| parent | new version (diff) | |
| download | historical-9efa896e15e3d69983c4e14a2403650fd53570ce.tar.gz historical-9efa896e15e3d69983c4e14a2403650fd53570ce.tar.bz2 historical-9efa896e15e3d69983c4e14a2403650fd53570ce.zip | |
Do not install librt.so linker script anymore, as librt.so.1
breaks things with librt.so as a script.
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/Manifest | 4 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.2-r3.ebuild | 9 |
3 files changed, 14 insertions, 5 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 5b6aeab25fae..11fe016a4372 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.70 2003/07/24 18:17:59 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.71 2003/07/28 01:42:13 azarah Exp $ + + 28 Jul 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r3.ebuild: + Do not install librt.so linker script anymore, as librt.so.1 breaks things + with librt.so as a script. *glibc-2.3.2-r3 (23 Jul 2003) diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index a6b851ba905b..ece446f5eb0e 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,5 +1,5 @@ -MD5 d3c6fcb0fc5ba8a00a4d5ab49a0efc19 glibc-2.3.2-r3.ebuild 16453 -MD5 824d3c58fdad83d1ef909b7fe42847a8 ChangeLog 14546 +MD5 e436fcb928a954961dc15691eccc040d glibc-2.3.2-r3.ebuild 16573 +MD5 0287e6385a500750be05221a5534cce1 ChangeLog 14728 MD5 9cdf445e21fafcd8a8db819e9d9d93fe glibc-2.3.2-r1.ebuild 16466 MD5 fd815f22f9479f0e2053fbd84239e55f glibc-2.3.2-r2.ebuild 16858 MD5 5cf2ad2ae0b712b0fd0b8659e6334a46 glibc-2.3.1-r4.ebuild 10393 diff --git a/sys-libs/glibc/glibc-2.3.2-r3.ebuild b/sys-libs/glibc/glibc-2.3.2-r3.ebuild index 80add2d0add7..8bffe0507ebb 100644 --- a/sys-libs/glibc/glibc-2.3.2-r3.ebuild +++ b/sys-libs/glibc/glibc-2.3.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r3.ebuild,v 1.2 2003/07/24 18:28:53 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r3.ebuild,v 1.3 2003/07/28 01:42:13 azarah Exp $ IUSE="nls pic build nptl" @@ -459,7 +459,7 @@ src_install() { install -C ${buildtarget} || die # If librt.so is a symlink, change it into linker script (Redhat) - if [ -L ${D}/usr/lib/librt.so ] + if [ -L "${D}/usr/lib/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ] then local LIBRTSO="`cd ${D}/lib; echo librt.so.*`" local LIBPTHREADSO="`cd ${D}/lib; echo libpthread.so.*`" @@ -473,6 +473,11 @@ EOF grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \ >> ${D}/usr/lib/librt.so + + for x in ${D}/usr/lib/librt.so.[1-9] + do + [ -L "${x}" ] && rm -f ${x} + done fi if [ -z "`use build`" ] |