diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-05-06 00:08:35 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-28 09:44:07 +0100 |
commit | fb3f5c68fdc9a2f73b95a9b4d3df916215f815d1 (patch) | |
tree | d1e6fa7e843ffb9d303371703461093f7c9a311a | |
parent | 342958fce10ee49f98094bcce6169a3b521b8301 (diff) | |
download | poky-fb3f5c68fdc9a2f73b95a9b4d3df916215f815d1.tar.gz |
mesa: fix do_install_append
"ifdef MESA_EGL_NO_X11_HEADERS" -> "if defined(MESA_EGL_NO_X11_HEADERS)"
(From OE-Core master rev: 3a464d67b60f70b865f7db768e7edc53e40ff450)
(From OE-Core rev: 12e467f436fbc22f274558c753f0ac9756ce1071)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/mesa/mesa_10.4.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa_git.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa_10.4.4.bb b/meta/recipes-graphics/mesa/mesa_10.4.4.bb index 8140411752..90cccbeba9 100644 --- a/meta/recipes-graphics/mesa/mesa_10.4.4.bb +++ b/meta/recipes-graphics/mesa/mesa_10.4.4.bb | |||
@@ -11,6 +11,6 @@ S = "${WORKDIR}/Mesa-${PV}" | |||
11 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER | 11 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER |
12 | do_install_append() { | 12 | do_install_append() { |
13 | if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then | 13 | if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then |
14 | sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h | 14 | sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h |
15 | fi | 15 | fi |
16 | } | 16 | } |
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb index cbe891118d..159801930b 100644 --- a/meta/recipes-graphics/mesa/mesa_git.bb +++ b/meta/recipes-graphics/mesa/mesa_git.bb | |||
@@ -13,6 +13,6 @@ S = "${WORKDIR}/git" | |||
13 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER | 13 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER |
14 | do_install_append() { | 14 | do_install_append() { |
15 | if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then | 15 | if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then |
16 | sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h | 16 | sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h |
17 | fi | 17 | fi |
18 | } | 18 | } |