summaryrefslogtreecommitdiffstats
path: root/meta
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:30:28 +0100
commit4304d0bfd88ca64262d3e3ca26a47a029c1a3f71 (patch)
tree7e3be76a61ebe73365705db325d5b87ad26716c8 /meta
parentcd28f5fbf72cac252a64dcee5e2c6bececc45dd8 (diff)
downloadpoky-4304d0bfd88ca64262d3e3ca26a47a029c1a3f71.tar.gz
cairo: merge cairo-fpu.inc into cairo.inc
(From OE-Core rev: 88cc5d488d5e187852fc10086a1afce6dcfc4cd6) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 @@
1
2def get_cairo_fpu_setting(bb, d):
3 if d.getVar('TARGET_FPU') in [ 'soft' ]:
4 return "--disable-some-floating-point"
5 return ""
6
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"
33PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2" 33PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2"
34PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" 34PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl"
35 35
36#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 36EXTRA_OECONF += " \
37require cairo-fpu.inc 37 ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some-floating-point', '', d)} \
38EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} \ 38 --enable-tee \
39 --enable-tee \ 39"
40 "
41 40
42inherit autotools pkgconfig upstream-version-is-even gtk-doc 41inherit autotools pkgconfig upstream-version-is-even gtk-doc
43 42