Signed-off-by: Andre McCurdy <[email protected]>
---
meta/recipes-graphics/cairo/cairo-fpu.inc | 6 ------
meta/recipes-graphics/cairo/cairo.inc | 9 ++++-----
2 files changed, 4 insertions(+), 11 deletions(-)
delete mode 100644 meta/recipes-graphics/cairo/cairo-fpu.inc
diff --git a/meta/recipes-graphics/cairo/cairo-fpu.inc
b/meta/recipes-graphics/cairo/cairo-fpu.inc
deleted file mode 100644
index fe7c533..0000000
--- a/meta/recipes-graphics/cairo/cairo-fpu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-def get_cairo_fpu_setting(bb, d):
- if d.getVar('TARGET_FPU') in [ 'soft' ]:
- return "--disable-some-floating-point"
- return ""
-
diff --git a/meta/recipes-graphics/cairo/cairo.inc
b/meta/recipes-graphics/cairo/cairo.inc
index 7347f22..b432da0 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -33,11 +33,10 @@ PACKAGECONFIG[egl] =
"--enable-egl=yes,--disable-egl,virtual/egl"
PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2"
PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl"
-#check for TARGET_FPU=soft and inform configure of the result so it can
disable some floating points
-require cairo-fpu.inc
-EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} \
- --enable-tee \
- "
+EXTRA_OECONF += " \
+ ${@bb.utils.contains('TARGET_FPU', 'soft',
'--disable-some-floating-point', '', d)} \
+ --enable-tee \
+"
inherit autotools pkgconfig upstream-version-is-even gtk-doc
--
1.9.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
