diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-01-05 03:04:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-01-05 03:04:27 +0000 |
| commit | dec50294edd7623add8cba2e2491080fa8b0f1f6 (patch) | |
| tree | 6e98da477bb4d258825c647e2a1cf830a1dd8349 /sys-libs/glibc | |
| parent | Version bump. (diff) | |
| download | gentoo-2-dec50294edd7623add8cba2e2491080fa8b0f1f6.tar.gz gentoo-2-dec50294edd7623add8cba2e2491080fa8b0f1f6.tar.bz2 gentoo-2-dec50294edd7623add8cba2e2491080fa8b0f1f6.zip | |
fix timezone-data DEPEND for cross builds
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.5-r3.ebuild | 12 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.6.ebuild | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys-libs/glibc/glibc-2.3.5-r3.ebuild b/sys-libs/glibc/glibc-2.3.5-r3.ebuild index 1f7ca9a0ba2c..bb59a9d68ca1 100644 --- a/sys-libs/glibc/glibc-2.3.5-r3.ebuild +++ b/sys-libs/glibc/glibc-2.3.5-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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.3.5-r3.ebuild,v 1.10 2005/12/17 00:46:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.11 2006/01/05 03:04:27 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -1031,12 +1031,9 @@ DEPEND=">=sys-devel/gcc-3.2.3-r1 >=sys-devel/binutils-2.15 >=sys-devel/gcc-config-1.3.9 virtual/os-headers - sys-libs/timezone-data nls? ( sys-devel/gettext ) selinux? ( !build? ( sys-libs/libselinux ) )" - -RDEPEND="sys-libs/timezone-data - nls? ( sys-devel/gettext ) +RDEPEND="nls? ( sys-devel/gettext ) selinux? ( !build? ( sys-libs/libselinux ) )" if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then @@ -1049,6 +1046,9 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then DEPEND="${DEPEND} ${CATEGORY}/linux-headers" fi fi +else + DEPEND="${DEPEND} sys-libs/timezone-data" + RDEPEND="${RDEPEND} sys-libs/timezone-data" fi pkg_setup() { diff --git a/sys-libs/glibc/glibc-2.3.6.ebuild b/sys-libs/glibc/glibc-2.3.6.ebuild index ff5f5e833092..829055a0dded 100644 --- a/sys-libs/glibc/glibc-2.3.6.ebuild +++ b/sys-libs/glibc/glibc-2.3.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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.3.6.ebuild,v 1.9 2005/12/17 00:46:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.10 2006/01/05 03:04:27 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -1047,12 +1047,9 @@ DEPEND=">=sys-devel/gcc-3.3.3 >=sys-devel/binutils-2.16.1 >=sys-devel/gcc-config-1.3.12 virtual/os-headers - sys-libs/timezone-data nls? ( sys-devel/gettext ) selinux? ( !build? ( sys-libs/libselinux ) )" - -RDEPEND="sys-libs/timezone-data - nls? ( sys-devel/gettext ) +RDEPEND="nls? ( sys-devel/gettext ) selinux? ( !build? ( sys-libs/libselinux ) )" if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then @@ -1065,6 +1062,9 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then DEPEND="${DEPEND} ${CATEGORY}/linux-headers" fi fi +else + DEPEND="${DEPEND} sys-libs/timezone-data" + RDEPEND="${RDEPEND} sys-libs/timezone-data" fi pkg_setup() { |