summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gall <tgall@gentoo.org>2004-10-19 19:52:14 +0000
committerTom Gall <tgall@gentoo.org>2004-10-19 19:52:14 +0000
commitfbc62f1e76df68969d4ddf9f2644e9e0256a5861 (patch)
treeb3a1b53b7513ee0356dbadc99a84f213b3895245 /sys-libs
parentFixed broken Manifest. (Manifest recommit) (diff)
downloadgentoo-2-fbc62f1e76df68969d4ddf9f2644e9e0256a5861.tar.gz
gentoo-2-fbc62f1e76df68969d4ddf9f2644e9e0256a5861.tar.bz2
gentoo-2-fbc62f1e76df68969d4ddf9f2644e9e0256a5861.zip
saner fix for failing mv case
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog5
-rw-r--r--sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild6
2 files changed, 6 insertions, 5 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 <tgall@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
+ sane fix for problem mentioned below
16 Oct 2004; Tom Gall <tgall@gentoo.org> 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/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