From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 12 Feb 2007 05:07:03 +0000 (+0000)
Subject: use new tc-is-softfloat from toolchain-funcs.eclass
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=da818641df82d0dd452e1f72c70cf4a11d918a20;p=gentoo.git

use new tc-is-softfloat from toolchain-funcs.eclass
Package-Manager: portage-2.1.2-r9
---

diff --git a/sys-libs/newlib/newlib-1.14.0.ebuild b/sys-libs/newlib/newlib-1.14.0.ebuild
index 13f66009aa2d..5f6cfbfc7fab 100644
--- a/sys-libs/newlib/newlib-1.14.0.ebuild
+++ b/sys-libs/newlib/newlib-1.14.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.14.0.ebuild,v 1.3 2006/11/06 00:37:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.14.0.ebuild,v 1.4 2007/02/12 05:05:23 vapier Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -48,7 +48,7 @@ src_compile() {
 
 	local myconf=""
 	# hardwired to avoid breakages
-	[[ ${CTARGET} == *-softfloat-* ]] \
+	[[ $(tc-is-softfloat) == "no" ]] \
 		&& myconf="--disable-newlib-hw-fp" \
 		|| myconf="--enable-newlib-hw-fp"
 	[[ ${CTARGET} == "spu" ]] \
diff --git a/sys-libs/newlib/newlib-1.15.0.ebuild b/sys-libs/newlib/newlib-1.15.0.ebuild
index a8052369d89f..3c2d6b612097 100644
--- a/sys-libs/newlib/newlib-1.15.0.ebuild
+++ b/sys-libs/newlib/newlib-1.15.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.15.0.ebuild,v 1.2 2007/02/05 14:51:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-1.15.0.ebuild,v 1.3 2007/02/12 05:05:23 vapier Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -46,7 +46,7 @@ src_compile() {
 
 	local myconf=""
 	# hardwired to avoid breakages
-	[[ ${CTARGET//_/-} == *-softfloat-* ]] \
+	[[ $(tc-is-softfloat) == "no" ]] \
 		&& myconf="--disable-newlib-hw-fp" \
 		|| myconf="--enable-newlib-hw-fp"
 	[[ ${CTARGET} == "spu" ]] \
diff --git a/sys-libs/newlib/newlib-20061203.ebuild b/sys-libs/newlib/newlib-20061203.ebuild
index 1fe00a3f7532..46725a20e428 100644
--- a/sys-libs/newlib/newlib-20061203.ebuild
+++ b/sys-libs/newlib/newlib-20061203.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-20061203.ebuild,v 1.2 2006/12/10 00:46:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-20061203.ebuild,v 1.3 2007/02/12 05:05:23 vapier Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -47,7 +47,7 @@ src_compile() {
 
 	local myconf=""
 	# hardwired to avoid breakages
-	[[ ${CTARGET} == *-softfloat-* ]] \
+	[[ $(tc-is-softfloat) == "no" ]] \
 		&& myconf="--disable-newlib-hw-fp" \
 		|| myconf="--enable-newlib-hw-fp"
 	[[ ${CTARGET} == "spu" ]] \
diff --git a/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild
index d21108094484..3f94da391002 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-2007 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.23 2007/01/28 06:54:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v 1.24 2007/02/12 05:07:03 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -184,7 +184,7 @@ src_unpack() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	echo "ARCH_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config
 
-	if [[ ${CTARGET//_/-} == *-softfloat-* ]] ; then
+	if [[ $(tc-is-softfloat) != "yes" ]] ; then
 		sed -i -e '/^HAS_FPU=y$/d' .config
 		echo 'HAS_FPU=n' >> .config
 	fi
diff --git a/sys-libs/uclibc/uclibc-0.9.28-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.28-r1.ebuild
index 9447113de7fe..87bde5626e22 100644
--- a/sys-libs/uclibc/uclibc-0.9.28-r1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28-r1.ebuild
@@ -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/sys-libs/uclibc/uclibc-0.9.28-r1.ebuild,v 1.8 2007/01/28 06:54:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28-r1.ebuild,v 1.9 2007/02/12 05:07:03 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -204,7 +204,7 @@ src_unpack() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	echo "ARCH_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config
 
-	if [[ ${CTARGET//_/-} == *-softfloat-* ]] ; then
+	if [[ $(tc-is-softfloat) != "yes" ]] ; then
 		sed -i -e '/^HAS_FPU=y$/d' .config
 		echo 'HAS_FPU=n' >> .config
 	fi
diff --git a/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild b/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild
index 6d3024fd50dd..df5236fc598f 100644
--- a/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild
@@ -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/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild,v 1.3 2007/01/28 06:54:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild,v 1.4 2007/02/12 05:07:03 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -204,7 +204,7 @@ src_unpack() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	echo "ARCH_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config
 
-	if [[ ${CTARGET//_/-} == *-softfloat-* ]] ; then
+	if [[ $(tc-is-softfloat) != "yes" ]] ; then
 		sed -i -e '/^HAS_FPU=y$/d' .config
 		echo 'HAS_FPU=n' >> .config
 	fi
diff --git a/sys-libs/uclibc/uclibc-0.9.28.1.ebuild b/sys-libs/uclibc/uclibc-0.9.28.1.ebuild
index f4bdc0a5bec2..632e227b5477 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28.1.ebuild
@@ -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/sys-libs/uclibc/uclibc-0.9.28.1.ebuild,v 1.1 2007/01/28 08:16:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.1.ebuild,v 1.2 2007/02/12 05:07:03 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -205,7 +205,7 @@ src_unpack() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	echo "ARCH_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config
 
-	if [[ ${CTARGET//_/-} == *-softfloat-* ]] ; then
+	if [[ $(tc-is-softfloat) != "yes" ]] ; then
 		sed -i -e '/^HAS_FPU=y$/d' .config
 		echo 'HAS_FPU=n' >> .config
 	fi
diff --git a/sys-libs/uclibc/uclibc-0.9.28.ebuild b/sys-libs/uclibc/uclibc-0.9.28.ebuild
index 27674ba26889..70a6c5fde8e0 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-2007 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.28 2007/01/28 06:54:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.ebuild,v 1.29 2007/02/12 05:07:03 vapier Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -204,7 +204,7 @@ src_unpack() {
 	sed -i -e '/ARCH_.*_ENDIAN/d' .config
 	echo "ARCH_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config
 
-	if [[ ${CTARGET//_/-} == *-softfloat-* ]] ; then
+	if [[ $(tc-is-softfloat) != "yes" ]] ; then
 		sed -i -e '/^HAS_FPU=y$/d' .config
 		echo 'HAS_FPU=n' >> .config
 	fi