From 7f7512807340fcc73db2e3947ca727cafb0a6698 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 15 Mar 2006 01:48:51 +0000 Subject: [PATCH] use _E_CROSS_HEADERS_ONLY in USE rather than as an env var Package-Manager: portage-2.1_pre6-r2 --- sys-libs/glibc/glibc-2.3.6-r1.ebuild | 5 ++--- sys-libs/glibc/glibc-2.3.6-r2.ebuild | 5 ++--- sys-libs/glibc/glibc-2.3.6-r3.ebuild | 5 ++--- sys-libs/glibc/glibc-2.4.ebuild | 5 ++--- sys-libs/uclibc/uclibc-0.9.27-r1.ebuild | 8 +++----- sys-libs/uclibc/uclibc-0.9.28.ebuild | 6 ++---- 6 files changed, 13 insertions(+), 21 deletions(-) diff --git a/sys-libs/glibc/glibc-2.3.6-r1.ebuild b/sys-libs/glibc/glibc-2.3.6-r1.ebuild index 38d0c31ffd1b..ca07155b50a9 100644 --- a/sys-libs/glibc/glibc-2.3.6-r1.ebuild +++ b/sys-libs/glibc/glibc-2.3.6-r1.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.3.6-r1.ebuild,v 1.16 2006/01/26 02:17:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r1.ebuild,v 1.17 2006/03/15 01:48:51 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -67,8 +67,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - [[ -z ${_E_CROSS_HEADERS_ONLY} ]] && return 1 - is_crosscompile + is_crosscompile && has _E_CROSS_HEADERS_ONLY ${USE} } GLIBC_RELEASE_VER=$(get_version_component_range 1-3) diff --git a/sys-libs/glibc/glibc-2.3.6-r2.ebuild b/sys-libs/glibc/glibc-2.3.6-r2.ebuild index 922126e33c67..2becf048477a 100644 --- a/sys-libs/glibc/glibc-2.3.6-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.6-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.3.6-r2.ebuild,v 1.13 2006/01/26 02:17:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r2.ebuild,v 1.14 2006/03/15 01:48:51 vapier Exp $ # TODO: # - fix warning from glibc build system: @@ -75,8 +75,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - [[ -z ${_E_CROSS_HEADERS_ONLY} ]] && return 1 - is_crosscompile + is_crosscompile && has _E_CROSS_HEADERS_ONLY ${USE} } GLIBC_RELEASE_VER=$(get_version_component_range 1-3) diff --git a/sys-libs/glibc/glibc-2.3.6-r3.ebuild b/sys-libs/glibc/glibc-2.3.6-r3.ebuild index 0304dc0c0d14..8ae65bd63e30 100644 --- a/sys-libs/glibc/glibc-2.3.6-r3.ebuild +++ b/sys-libs/glibc/glibc-2.3.6-r3.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.3.6-r3.ebuild,v 1.4 2006/02/27 15:46:50 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r3.ebuild,v 1.5 2006/03/15 01:48:51 vapier Exp $ # TODO: # - fix warning from glibc build system: @@ -75,8 +75,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - [[ -z ${_E_CROSS_HEADERS_ONLY} ]] && return 1 - is_crosscompile + is_crosscompile && has _E_CROSS_HEADERS_ONLY ${USE} } GLIBC_RELEASE_VER=$(get_version_component_range 1-3) diff --git a/sys-libs/glibc/glibc-2.4.ebuild b/sys-libs/glibc/glibc-2.4.ebuild index 55fcd4c83184..376755bcf64a 100644 --- a/sys-libs/glibc/glibc-2.4.ebuild +++ b/sys-libs/glibc/glibc-2.4.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.ebuild,v 1.7 2006/03/12 17:57:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4.ebuild,v 1.8 2006/03/15 01:48:51 vapier Exp $ # TODO: # - fix warning from glibc build system: @@ -74,8 +74,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - [[ -z ${_E_CROSS_HEADERS_ONLY} ]] && return 1 - is_crosscompile + is_crosscompile && has _E_CROSS_HEADERS_ONLY ${USE} } GLIBC_RELEASE_VER=$(get_version_component_range 1-3) diff --git a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild index ccde23b5b000..c11f7cb67ccc 100644 --- a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild +++ b/sys-libs/uclibc/uclibc-0.9.27-r1.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/uclibc/uclibc-0.9.27-r1.ebuild,v 1.15 2005/12/29 12:30:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v 1.16 2006/03/15 01:47:04 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -77,9 +77,7 @@ alt_rprefix() { fi } just_headers() { - [[ -z ${_E_CROSS_HEADERS_ONLY} ]] && return 1 - [[ ${CHOST} == ${CTARGET} ]] && return 1 - return 0 + has _E_CROSS_HEADERS_ONLY ${USE} && [[ ${CHOST} != ${CTARGET} ]] } pkg_setup() { diff --git a/sys-libs/uclibc/uclibc-0.9.28.ebuild b/sys-libs/uclibc/uclibc-0.9.28.ebuild index e94a93851bee..0cfa82e3795d 100644 --- a/sys-libs/uclibc/uclibc-0.9.28.ebuild +++ b/sys-libs/uclibc/uclibc-0.9.28.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/uclibc/uclibc-0.9.28.ebuild,v 1.20 2006/03/11 03:23:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.ebuild,v 1.21 2006/03/15 01:47:04 vapier Exp $ #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" #inherit subversion @@ -75,9 +75,7 @@ alt_rprefix() { fi } just_headers() { - [[ -z ${_E_CROSS_HEADERS_ONLY} ]] && return 1 - [[ ${CHOST} == ${CTARGET} ]] && return 1 - return 0 + has _E_CROSS_HEADERS_ONLY ${USE} && [[ ${CHOST} != ${CTARGET} ]] } pkg_setup() { -- 2.26.2