mesa: move PACKAGE_ARCH = MACHINE_ARCH to the mesa-dri include

mesa-dri is the only machine specific one, leaking MACHINE_ARCH into mesa-x11 causes massive sstate mismatch

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 1 insertions, 3 deletions

diff --git a/meta-oe/recipes-graphics/mesa/mesa-common.inc b/meta-oe/recipes-graphics/mesa/mesa-common.inc
index 3b255c469..29e2acabf 100644
--- a/meta-oe/recipes-graphics/mesa/mesa-common.inc
+++ b/meta-oe/recipes-graphics/mesa/mesa-common.inc
@@ -28,9 +28,6 @@ EXTRA_OECONF = "--enable-glu \
 
 inherit glx-use-tls
 
-# Package contents vary according to ${MACHINE_DRI_MODULES}.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
 PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
 FILES_${PN} += "${libdir}/dri/*.so"
 FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
diff --git a/meta-oe/recipes-graphics/mesa/mesa-dri.inc b/meta-oe/recipes-graphics/mesa/mesa-dri.inc
index 0a5a576e9..4c5934da1 100644
--- a/meta-oe/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta-oe/recipes-graphics/mesa/mesa-dri.inc
@@ -7,4 +7,5 @@ FILESPATH =. "${FILE_DIRNAME}/mesa:${FILE_DIRNAME}/mesa-${PV}:"
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 EXTRA_OECONF += " --with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"