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:41 +0100
commit3b05a9beffafe5637fba36dbd301139e912ec2a4 (patch)
tree6d2632a510fd86addd544baa0b0ab2e85a78c4a3
parent1e59ae05c1c5215c43b2e8a5e89ad6a5d63540c1 (diff)
downloadpoky-3b05a9beffafe5637fba36dbd301139e912ec2a4.tar.gz
mesa: clean up PACKAGECONFIG
Use machine overrides instead of machine features. (From OE-Core rev: 821a38d71d7e15f5871f44a3ee08268d05ef610e) 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"
12LICENSE = "MIT" 12LICENSE = "MIT"
13LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" 13LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
14 14
15INC_PR = "r2" 15INC_PR = "r3"
16PE = "2" 16PE = "2"
17 17
18DEPENDS = "libxml2-native makedepend-native flex-native bison-native" 18DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
@@ -29,9 +29,8 @@ EXTRA_OECONF = "--enable-glu \
29 --disable-glut \ 29 --disable-glut \
30 --enable-shared-glapi" 30 --enable-shared-glapi"
31 31
32PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)} \ 32PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
33 ${@base_contains('MACHINE_FEATURES', 'x86', 'egl', '', d)} \ 33PACKAGECONFIG_append_x86 = " gles egl"
34 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
35 34
36X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" 35X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
37PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" 36PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"