summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-03-15 07:10:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:26 +0000
commit370419edca7ae5a607c70e0b48e9ad72012b71af (patch)
treec43c293c37cc0437cd11675ffb8382fc30bb4724
parent872797565b44c62dbd1eece97c399853afa4bdc7 (diff)
downloadpoky-370419edca7ae5a607c70e0b48e9ad72012b71af.tar.gz
xcb-util-image: Fix build with clang
(From OE-Core rev: fa65ce8bc0fb6559fcee73b0d899268ee7e6f89b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch24
-rw-r--r--meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb5
2 files changed, 28 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch b/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch
new file mode 100644
index 0000000000..11e90940a1
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch
@@ -0,0 +1,24 @@
1Make clang happy since it squashes the control warning, ideally it will never reach that return value due to assert
2but there is a chance when NDEBUG is defined
3
4| In file included from ../../xcb-util-image-0.4.0/image/xcb_image.c:37:
5| ../../xcb-util-image-0.4.0/image/xcb_bitops.h:210:1: error: control may reach end of non-void function [-Werror,-Wreturn-type]
6| }
7| ^
8| 1 error generated.
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Upstream-Status: Pending
12
13Index: xcb-util-image-0.4.0/image/xcb_bitops.h
14===================================================================
15--- xcb-util-image-0.4.0.orig/image/xcb_bitops.h
16+++ xcb-util-image-0.4.0/image/xcb_bitops.h
17@@ -207,6 +207,7 @@ xcb_host_byte_order(void) {
18 return XCB_IMAGE_ORDER_LSB_FIRST;
19 }
20 assert(0);
21+ return -1;
22 }
23
24 #endif /* __XCB_BITOPS_H__ */
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb
index 91464b6c98..c6bb5a61cd 100644
--- a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb
+++ b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb
@@ -6,5 +6,8 @@ LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://image/xcb_image.c;endline=24;md5=eafdf965cfb89955fdedf75054223fb4 \ 6LIC_FILES_CHKSUM = "file://image/xcb_image.c;endline=24;md5=eafdf965cfb89955fdedf75054223fb4 \
7 file://image/xcb_image.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c" 7 file://image/xcb_image.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c"
8 8
9SRC_URI += "file://clang.patch \
10"
11
9SRC_URI[md5sum] = "08fe8ffecc8d4e37c0ade7906b3f4c87" 12SRC_URI[md5sum] = "08fe8ffecc8d4e37c0ade7906b3f4c87"
10SRC_URI[sha256sum] = "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc" \ No newline at end of file 13SRC_URI[sha256sum] = "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc"