summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Becker <geoman@gentoo.org>2006-04-13 16:04:26 +0000
committerStephen Becker <geoman@gentoo.org>2006-04-13 16:04:26 +0000
commit1ae9ebaa0a04a0ef26cf766657a5adce4e7f0e7d (patch)
tree0f24bde772909e04a07c69fd722b58c203a74910 /sys-libs/glibc
parentDropping ~ppc keyword because of unmarked deps. Will remark all of koffice so... (diff)
downloadgentoo-2-1ae9ebaa0a04a0ef26cf766657a5adce4e7f0e7d.tar.gz
gentoo-2-1ae9ebaa0a04a0ef26cf766657a5adce4e7f0e7d.tar.bz2
gentoo-2-1ae9ebaa0a04a0ef26cf766657a5adce4e7f0e7d.zip
fix DEPEND so that we can use mips-headers with USE=nptl
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'sys-libs/glibc')
-rw-r--r--sys-libs/glibc/ChangeLog5
-rw-r--r--sys-libs/glibc/glibc-2.4-r2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 5bed091d0da8..1a7857733d7b 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.439 2006/04/01 04:58:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.440 2006/04/13 16:04:25 geoman Exp $
+
+ 13 Apr 2006; Stephen P. Becker <geoman@gentoo.org> glibc-2.4-r2.ebuild:
+ fix DEPEND so that we can use mips-headers with USE=nptl
*glibc-2.4-r2 (01 Apr 2006)
diff --git a/sys-libs/glibc/glibc-2.4-r2.ebuild b/sys-libs/glibc/glibc-2.4-r2.ebuild
index 85b8e87a717a..12a072a8a178 100644
--- a/sys-libs/glibc/glibc-2.4-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.4-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r2.ebuild,v 1.7 2006/04/13 05:45:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r2.ebuild,v 1.8 2006/04/13 16:04:26 geoman Exp $
# Here's how the cross-compile logic breaks down ...
# CTARGET - machine that will target the binaries
@@ -1053,7 +1053,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
ppc? ( >=sys-devel/gcc-4.1.0 )
ppc64? ( >=sys-devel/gcc-4.1.0 )
- nptl? ( >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} )
+ nptl? ( || ( >=sys-kernel/mips-headers-${NPTL_KERNEL_VERSION} >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} ) )
>=sys-devel/binutils-2.15.94
>=sys-devel/gcc-config-1.3.12
>=app-misc/pax-utils-0.1.10