diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-08-23 19:09:08 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-28 10:30:28 +0100 |
commit | 4304d0bfd88ca64262d3e3ca26a47a029c1a3f71 (patch) | |
tree | 7e3be76a61ebe73365705db325d5b87ad26716c8 /meta/recipes-graphics/cairo/cairo.inc | |
parent | cd28f5fbf72cac252a64dcee5e2c6bececc45dd8 (diff) | |
download | poky-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/recipes-graphics/cairo/cairo.inc')
-rw-r--r-- | meta/recipes-graphics/cairo/cairo.inc | 9 |
1 files changed, 4 insertions, 5 deletions
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" | |||
33 | PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2" | 33 | PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2" |
34 | PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" | 34 | PACKAGECONFIG[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 | 36 | EXTRA_OECONF += " \ |
37 | require cairo-fpu.inc | 37 | ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some-floating-point', '', d)} \ |
38 | EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} \ | 38 | --enable-tee \ |
39 | --enable-tee \ | 39 | " |
40 | " | ||
41 | 40 | ||
42 | inherit autotools pkgconfig upstream-version-is-even gtk-doc | 41 | inherit autotools pkgconfig upstream-version-is-even gtk-doc |
43 | 42 | ||