[oe-commits] Koen Kooi : navit: fix build with qt4 in staging, only enable floats when you have an fpu

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 31113502d63b822a853eef33e2629c78fba76cb2
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=31113502d63b822a853eef33e2629c78fba76cb2

Author: Koen Kooi <koen at openembedded.org>
Date:   Sun Jan 10 12:21:33 2010 +0100

navit: fix build with qt4 in staging, only enable floats when you have an fpu

---

 recipes/navit/navit-fpu.inc |    6 ++++++
 recipes/navit/navit.inc     |   15 +++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/recipes/navit/navit-fpu.inc b/recipes/navit/navit-fpu.inc
new file mode 100644
index 0000000..d333b92
--- /dev/null
+++ b/recipes/navit/navit-fpu.inc
@@ -0,0 +1,6 @@
+
+def get_navit_fpu_setting(bb, d):
+	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+		return "--enable-avoid-float"
+	return ""
+
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index 0b0c364..ad29f34 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -5,11 +5,22 @@ DEPENDS = "glib-2.0 gtk+"
 RRECOMMENDS = "gpsd speechd flite"
 
 PE = "1"
-INC_PR = "r4"
+INC_PR = "r5"
 
 inherit autotools
 
-EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
+EXTRA_OECONF = " \
+  --disable-binding-python \
+  --disable-gui-sdl \
+  --disable-samplemap \
+  --enable-avoid-unaligned \
+  --disable-graphics-qt-qpainter \
+"
+
+#  --enable-avoid-float \
+#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+require navit-fpu.inc
+EXTRA_OECONF += "${@get_navit_fpu_setting(bb, d)}"
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"