summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-08-20 11:25:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-23 11:04:37 +0100
commit821a38d71d7e15f5871f44a3ee08268d05ef610e (patch)
treec8953e53c12e2d6b0785770ba637bd6cd73cee7a
parent24d31cd30080401271936422e6bd77727a16e0a6 (diff)
downloadopenembedded-core-821a38d71d7e15f5871f44a3ee08268d05ef610e.tar.gz
mesa: clean up PACKAGECONFIG
Use machine overrides instead of machine features. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index de171f0845..cfe4a37c0c 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
-INC_PR = "r2"
+INC_PR = "r3"
PE = "2"
DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
@@ -29,9 +29,8 @@ EXTRA_OECONF = "--enable-glu \
--disable-glut \
--enable-shared-glapi"
-PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)} \
- ${@base_contains('MACHINE_FEATURES', 'x86', 'egl', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG_append_x86 = " gles egl"
X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"