summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-01-10 12:21:33 +0100
committerKoen Kooi <koen@openembedded.org>2010-01-10 12:25:21 +0100
commit31113502d63b822a853eef33e2629c78fba76cb2 (patch)
tree00b7e36f29df19ba9d8857a7c2426bd65f70840c
parent8274bc3cdd5c071057d36f85980174215e127d2e (diff)
navit: fix build with qt4 in staging, only enable floats when you have an fpu
-rw-r--r--recipes/navit/navit-fpu.inc6
-rw-r--r--recipes/navit/navit.inc15
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 0000000000..d333b92001
--- /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 0b0c36470d..ad29f347ed 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"