From 5058524e291a78bca7d661e23d361f4f31e29418 Mon Sep 17 00:00:00 2001 From: Tom Gall Date: Tue, 19 Oct 2004 19:52:14 +0000 Subject: [PATCH] saner fix for failing mv case --- sys-libs/glibc/ChangeLog | 5 ++++- sys-libs/glibc/Manifest | 4 ++-- sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild | 6 ++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index bab1db14ff8a..1f0f82bb45fe 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/glibc # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.279 2004/10/18 23:20:25 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.280 2004/10/19 19:52:14 tgall Exp $ + + 19 Oct 2004; Tom Gall glibc-2.3.4.20040808-r1.ebuild: + sane fix for problem mentioned below 16 Oct 2004; Tom Gall glibc-2.3.4.20040808-r1.ebuild: emergancy fix, code from lv's change on 10/13 h0rked up ppc64 royally diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 5384366fefbd..8b1802e97e65 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,11 +1,11 @@ -MD5 82c3bb9abc4fb5a0745655e5aaf7b4a6 ChangeLog 57862 +MD5 b8432c444e99679da663e310ac65f532 ChangeLog 57977 MD5 7cf88dee2671dcc30659d07241b8d918 glibc-2.2.5-r9.ebuild 10915 MD5 daf5c4924c0a0ccc6e55f7588b1b4d52 glibc-2.3.3.20040420-r2.ebuild 21765 MD5 af6f1491a70a6ee80e8d867d8ee0f98f glibc-2.3.4.20040619-r2.ebuild 20997 MD5 e4c331e4587e12f1ef96914a55da9234 glibc-2.3.4.20041006.ebuild 25990 MD5 3603fa6448052edcf78a329d10746461 glibc-2.3.2-r12.ebuild 20530 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -MD5 bad97685295c3c3b3c1d0709d2c1485b glibc-2.3.4.20040808-r1.ebuild 23194 +MD5 ac8cbd194b0e622f368f12f876f732a7 glibc-2.3.4.20040808-r1.ebuild 23089 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312 MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307 diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild index 0133784201d2..22fe3396a9bb 100644 --- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.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-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.9 2004/10/18 23:20:25 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.10 2004/10/19 19:52:14 tgall Exp $ inherit eutils flag-o-matic gcc @@ -606,9 +606,7 @@ src_install() { env -uRESTRICT prepallstrip # this directory can be empty in certain cases so || die is wrong - # but hey, this is an emergancy fix for ppc64 so I won't break anyone else - use ppc64 && mv ${T}/thread-backup/* ${D}/$(get_libdir)/ - use !ppc64 && mv ${T}/thread-backup/* ${D}/$(get_libdir)/ || die + ls ${T}/thread-backup/* 1>/dev/null 2>&1 && mv -f ${T}/thread-backup/* ${D}/$(get_libdir)/ # If librt.so is a symlink, change it into linker script (Redhat) if [ -L "${D}/usr/lib/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]; then -- 2.26.2