summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-08-23 19:09:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-28 10:27:15 +0100
commit88cc5d488d5e187852fc10086a1afce6dcfc4cd6 (patch)
tree25d528b025f507640898cd4923ee72c9b751e92a /meta/recipes-graphics
parent22af59c9bfec31b31027ebd2a4da162f481aa6b5 (diff)
downloadopenembedded-core-contrib-88cc5d488d5e187852fc10086a1afce6dcfc4cd6.tar.gz
openembedded-core-contrib-88cc5d488d5e187852fc10086a1afce6dcfc4cd6.tar.bz2
openembedded-core-contrib-88cc5d488d5e187852fc10086a1afce6dcfc4cd6.zip
cairo: merge cairo-fpu.inc into cairo.inc
Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/cairo/cairo-fpu.inc6
-rw-r--r--meta/recipes-graphics/cairo/cairo.inc9
2 files changed, 4 insertions, 11 deletions
diff --git a/meta/recipes-graphics/cairo/cairo-fpu.inc b/meta/recipes-graphics/cairo/cairo-fpu.inc
deleted file mode 100644
index fe7c53337a..0000000000
--- 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 7347f223ff..b432da0166 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