[oe-commits] Ross Burton : mesa: remove python2 detection hack
git at git.openembedded.org
git at git.openembedded.org
Mon Nov 12 13:22:47 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 1961ea1493caf5fe2959db2a11831a4a5a17eaeb
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1961ea1493caf5fe2959db2a11831a4a5a17eaeb
Author: Ross Burton <ross.burton at intel.com>
Date: Thu Nov 8 11:31:31 2012 +0000
mesa: remove python2 detection hack
Our python-native is 2.7.3 which ships python2, and we've been patching it in to
earlier versions since September 2011.
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-graphics/mesa/mesa-8.0.4.inc | 2 --
meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb | 2 +-
meta/recipes-graphics/mesa/mesa-dri_git.bb | 3 +--
meta/recipes-graphics/mesa/mesa-git.inc | 2 --
4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-8.0.4.inc b/meta/recipes-graphics/mesa/mesa-8.0.4.inc
index 9afb35d..c6307dc 100644
--- a/meta/recipes-graphics/mesa/mesa-8.0.4.inc
+++ b/meta/recipes-graphics/mesa/mesa-8.0.4.inc
@@ -13,8 +13,6 @@ SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46"
SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e"
do_configure_prepend() {
- #check for python not python2, because python-native does not stage python2 binary/link
- sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
# We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
}
diff --git a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
index bd62c98..fb35676 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb
@@ -1,4 +1,4 @@
require mesa-common.inc
require mesa-${PV}.inc
require mesa-dri.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index 4b36f20..de1aa14 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -5,5 +5,4 @@ require mesa-dri.inc
# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default
DEFAULT_PREFERENCE = "-2"
-PR = "${INC_PR}.0"
-
+PR = "${INC_PR}.1"
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index 7910eb6..b907931 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -16,8 +16,6 @@ SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://0004-gross-ha
S = "${WORKDIR}/git"
do_configure_prepend() {
- #check for python not python2, because python-native does not stage python2 binary/link
- sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
# We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
}
More information about the Openembedded-commits
mailing list