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

diff --git a/recipes/navit/navit-fpu.inc b/recipes/navit/navit-fpu.inc
new file mode 100644 (file)
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 (file)
--- 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"