summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-13 16:20:51 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:31 +0000
commitbee65f99515d2044ebaaebfc2516d3ed88ba8224 (patch)
tree0bd7466106fb0aeba86eb717cc438136c30a762f
parent6296c0f9ab1f73b28de726a297a42e7c7e3f26aa (diff)
downloadpoky-bee65f99515d2044ebaaebfc2516d3ed88ba8224.tar.gz
eglinfo: Fix build on raspberrypi
(From OE-Core rev: 41c85bcf121ecaeae8097c9874fda51d8a4f2b4a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/eglinfo/eglinfo.inc4
-rw-r--r--meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch34
2 files changed, 37 insertions, 1 deletions
diff --git a/meta/recipes-graphics/eglinfo/eglinfo.inc b/meta/recipes-graphics/eglinfo/eglinfo.inc
index fb891755db..d0c0c27619 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo.inc
+++ b/meta/recipes-graphics/eglinfo/eglinfo.inc
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8d4f33bc3add976f7dfae85dab66f03c"
6 6
7DEPENDS = "virtual/egl" 7DEPENDS = "virtual/egl"
8 8
9SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master" 9SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \
10 file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \
11 "
10SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de" 12SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de"
11 13
12S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch b/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
new file mode 100644
index 0000000000..ca9f55c189
--- /dev/null
+++ b/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
@@ -0,0 +1,34 @@
1From 94b1e6daf7d70550b0e32fbb269fcf6887948d3f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 13 Jan 2016 16:08:22 -0800
4Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers
5
6bcm_host.h is in standard includedir in sysroot
7add that to header search paths.
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Submitted
12
13 wscript | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16diff --git a/wscript b/wscript
17index fcbb55b..cece8bf 100644
18--- a/wscript
19+++ b/wscript
20@@ -163,9 +163,10 @@ def configure_raspberrypi_device(conf, platform):
21 conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL')
22 import os
23 sysroot = conf.options.sysroot + conf.options.prefix
24+ std_include_path = os.path.join(sysroot, 'include')
25 vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads')
26 vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux')
27- if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path], uselib_store = 'EGL'):
28+ if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path, std_include_path], uselib_store = 'EGL'):
29 conf.fatal('Check if --prefix and --sysroot are set correctly.')
30 conf.env['WITH_APIS'] = []
31 if check_gles2(conf):
32--
332.7.0
34