From 9d9cc9dfbc454953589f596112439d3374ea7072 Mon Sep 17 00:00:00 2001 From: Tobias Olausson Date: Thu, 30 Jul 2015 13:50:02 -0700 Subject: Revert "mesa: fix do_install_append" The commit changed an #ifdef to #if defined(), but the source code for 10.4 branch of mesa still uses #ifdef. This reverts OE-Core commit 12e467f436fbc22f274558c753f0ac9756ce1071. (From OE-Core rev: 3eaaa488c811b6a8f7b855f9f2a666d106dbe433) Signed-off-by: Tobias Olausson Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa_10.4.4.bb | 2 +- meta/recipes-graphics/mesa/mesa_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/recipes-graphics/mesa/mesa_10.4.4.bb b/meta/recipes-graphics/mesa/mesa_10.4.4.bb index 90cccbeba9..8140411752 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}" #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER do_install_append() { if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - 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 + 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 fi } diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb index 159801930b..cbe891118d 100644 --- a/meta/recipes-graphics/mesa/mesa_git.bb +++ b/meta/recipes-graphics/mesa/mesa_git.bb @@ -13,6 +13,6 @@ S = "${WORKDIR}/git" #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER do_install_append() { if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - 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 + 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 fi } -- cgit v1.2.3-54-g00ecf