diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-10-01 13:16:44 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-10-01 13:16:44 +0000 |
| commit | 3ac4434d042be7fac113c132e057cef4a092c23b (patch) | |
| tree | a868c6d9d36a2d0bec443945202e5e953cee7bc0 | |
| parent | Stable for HPPA (bug #194039). (diff) | |
| download | historical-3ac4434d042be7fac113c132e057cef4a092c23b.tar.gz historical-3ac4434d042be7fac113c132e057cef4a092c23b.tar.bz2 historical-3ac4434d042be7fac113c132e057cef4a092c23b.zip | |
people have had plenty of time to transition to linux-info for set_arch_to_kernel/set_arch_to_portage ... time is up
| -rw-r--r-- | eclass/eutils.eclass | 32 | ||||
| -rw-r--r-- | eclass/linux-info.eclass | 14 |
2 files changed, 10 insertions, 36 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 777b54825efd..55aa49a76872 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.289 2007/09/01 03:24:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.290 2007/10/01 13:16:44 vapier Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -1565,36 +1565,6 @@ strip-linguas() { export LINGUAS=${newls:1} } -# @FUNCTION: set_arch_to_kernel -# @DESCRIPTION: -# Set the env ARCH to match what the kernel expects. -set_arch_to_kernel() { - i=10 - while ((i--)) ; do - ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" - done - export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" - case ${ARCH} in - x86) export ARCH="i386";; - amd64) export ARCH="x86_64";; - hppa) export ARCH="parisc";; - mips) export ARCH="mips";; - sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! - *) export ARCH="${ARCH}";; - esac -} - -# @FUNCTION: set_arch_to_portage -# @DESCRIPTION: -# Set the env ARCH to match what portage expects. -set_arch_to_portage() { - i=10 - while ((i--)) ; do - ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" - done - export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" -} - # @FUNCTION: preserve_old_lib # @USAGE: <libs to preserve> [more libs] # @DESCRIPTION: diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index b48d310fa477..c23e71517abd 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -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/eclass/linux-info.eclass,v 1.50 2006/12/07 18:52:55 dsd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.51 2007/10/01 13:16:44 vapier Exp $ # # Description: This eclass is used as a central eclass for accessing kernel # related information for sources already installed. @@ -69,10 +69,14 @@ case ${ARCH} in ppc64) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; esac -# These are legacy wrappers for toolchain-funcs. -# I dont like them here, but oh well. -set_arch_to_kernel() { export ARCH="$(tc-arch-kernel)"; } -set_arch_to_portage() { export ARCH="$(tc-arch)"; } +# @FUNCTION: set_arch_to_kernel +# @DESCRIPTION: +# Set the env ARCH to match what the kernel expects. +set_arch_to_kernel() { export ARCH=$(tc-arch-kernel); } +# @FUNCTION: set_arch_to_portage +# @DESCRIPTION: +# Set the env ARCH to match what portage expects. +set_arch_to_portage() { export ARCH=$(tc-arch); } # qeinfo "Message" # ------------------- |