From abe619ce54bd4d10a29f13da1bc890345a74087d Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Sat, 24 Jul 2004 19:55:33 +0000
Subject: Merge openembedded@openembedded.bkbits.net:packages into
 linux.local:/home/kergoth/code/packages

2004/07/24 15:55:24-04:00 local!kergoth
Add TARGET_FPU option, to allow us to more easily enable soft float
operation in our toolchains (set it to 'soft').

BKrev: 4102beb5HkyvZVLBWeqFY5dHqDaRdQ
---
 glibc/glibc_2.3.2.oe | 8 +++++++-
 glibc/glibc_cvs.oe   | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'glibc')

diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index ca40a7b480..c743e64d5f 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -110,7 +110,13 @@ EXTRA_OECONF = "--without-tls --without-__thread --enable-kernel=${OLDEST_KERNEL
 	        --without-cvs --disable-profile --disable-debug --without-gd \
 		--enable-clocale=gnu \
 	        --enable-add-ons=linuxthreads --with-headers=${WORKDIR}/linux/include"
-EXTRA_OECONF_append_ramses = " --without-fp"
+
+EXTRA_OECONF += "${@get_fpu_setting(oe, d)}"
+
+def get_fpu_setting(oe, d):
+	if oe.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		return "--without-fp"
+	return ""
 
 glibcbuild_do_unpack () {
 	mv "${WORKDIR}/linuxthreads" "${WORKDIR}/linuxthreads_db" "${S}/"
diff --git a/glibc/glibc_cvs.oe b/glibc/glibc_cvs.oe
index 7c208a36df..627dc3061f 100644
--- a/glibc/glibc_cvs.oe
+++ b/glibc/glibc_cvs.oe
@@ -80,7 +80,13 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
 	        --without-cvs --disable-profile --disable-debug --without-gd \
 		--enable-clocale=gnu \
 	        --enable-add-ons=${GLIBC_ADDONS} --with-headers=${HEADERS_DIR}/include ${GLIBC_EXTRA_OECONF}"
-EXTRA_OECONF_append_ramses = " --without-fp"
+
+EXTRA_OECONF += "${@get_fpu_setting(oe, d)}"
+
+def get_fpu_setting(oe, d):
+	if oe.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		return "--without-fp"
+	return ""
 
 glibcbuild_do_unpack () {
 # kernel headers
-- 
cgit v1.2.3