summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValentin Popa <valentin.popa@intel.com>2014-04-14 17:51:25 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-19 11:04:48 +0100
commitc65c136746d9f918a635440a6131ac27da2456d5 (patch)
treec3cdaf53c5a2e59db8001d08fd02ceee63f801e4
parent99f46fd25cdf544b0d25eb333c6329fd77174fa7 (diff)
downloadpoky-c65c136746d9f918a635440a6131ac27da2456d5.tar.gz
mesa: double check for eglplatform.h
Even if 'egl' is in PACKAGECONFIG, mesa egl support can be disabled explicitly (changing configure flags using a .bbappend, for example). On dora, meta-fsl-arm is an example of this kind. On master there are no known cases, and we should encourge package configuration through PACKAGECONFIG. This patch adds another check for the existence of eglplatform.h before 'sed' can alter it. (From OE-Core rev: 97bc1bce9a226cc02db8a5afc2c0d4f4f70034a6) Signed-off-by: Valentin Popa <valentin.popa@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa_9.1.6.bb4
-rw-r--r--meta/recipes-graphics/mesa/mesa_git.bb4
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa_9.1.6.bb b/meta/recipes-graphics/mesa/mesa_9.1.6.bb
index 6e9cd826f0..388cfd785c 100644
--- a/meta/recipes-graphics/mesa/mesa_9.1.6.bb
+++ b/meta/recipes-graphics/mesa/mesa_9.1.6.bb
@@ -19,6 +19,8 @@ S = "${WORKDIR}/Mesa-${PV}"
19#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 19#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
20do_install_append() { 20do_install_append() {
21 if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then 21 if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
22 sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h 22 if [ -e "${D}${includedir}/EGL/eglplatform.h" ]; then
23 sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
24 fi
23 fi 25 fi
24} \ No newline at end of file 26} \ No newline at end of file
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 1babcc05a9..714911f81f 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -23,6 +23,8 @@ S = "${WORKDIR}/git"
23#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 23#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
24do_install_append() { 24do_install_append() {
25 if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then 25 if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
26 sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h 26 if [ -e "${D}${includedir}/EGL/eglplatform.h" ]; then
27 sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
28 fi
27 fi 29 fi
28} 30}