diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-05-17 21:40:22 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-19 09:05:20 +0100 |
commit | 1613275de75037ba79aa88ee257f5055211de93d (patch) | |
tree | cf6f0c476242754d4dec7d81d5a46398ceba8af1 /meta/recipes-graphics/xorg-lib | |
parent | 479780d790cc4f6e93564bfd849824e9a7f9160c (diff) | |
download | poky-1613275de75037ba79aa88ee257f5055211de93d.tar.gz |
pixman: Fix build on arches not defining FE_INVALID exception
Nios2 e.g. only supports round to nearest in glibc
(From OE-Core rev: 074bf42d72ee2f5b155814eb24d52e06e2cebb9e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch | 33 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch b/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch new file mode 100644 index 0000000000..782c1db022 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 0ccd906b904d21536d5ab41c6196760e3e5d72cb Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 17 May 2016 17:30:00 -0700 | ||
4 | Subject: [PATCH] test/utils: Check for FE_INVALID definition before use | ||
5 | |||
6 | Some architectures e.g. nios2 do not support all exceptions | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Submitted | ||
11 | |||
12 | test/utils.c | 2 ++ | ||
13 | 1 file changed, 2 insertions(+) | ||
14 | |||
15 | diff --git a/test/utils.c b/test/utils.c | ||
16 | index f8e42a5..fe32b1e 100644 | ||
17 | --- a/test/utils.c | ||
18 | +++ b/test/utils.c | ||
19 | @@ -978,9 +978,11 @@ enable_invalid_exceptions (void) | ||
20 | { | ||
21 | #ifdef HAVE_FENV_H | ||
22 | #ifdef HAVE_FEENABLEEXCEPT | ||
23 | +#ifdef FE_INVALID | ||
24 | feenableexcept (FE_INVALID); | ||
25 | #endif | ||
26 | #endif | ||
27 | +#endif | ||
28 | } | ||
29 | |||
30 | void * | ||
31 | -- | ||
32 | 2.8.2 | ||
33 | |||
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb b/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb index 87da5c2abc..c4ca621a8a 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb | |||
@@ -32,6 +32,7 @@ EXTRA_OECONF_class-nativesdk = "--disable-gtk" | |||
32 | SRC_URI += "\ | 32 | SRC_URI += "\ |
33 | file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ | 33 | file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ |
34 | file://asm_include.patch \ | 34 | file://asm_include.patch \ |
35 | file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \ | ||
35 | " | 36 | " |
36 | 37 | ||
37 | SRC_URI[md5sum] = "002a4fcb644ddfcb4b0e4191576a0d59" | 38 | SRC_URI[md5sum] = "002a4fcb644ddfcb4b0e4191576a0d59" |