summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-11-08 11:31:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-12 13:36:39 +0000
commit1815a99f9fa290ae7dada90534b4d5db8e80a307 (patch)
tree847293b4e88a9c66f5b077ba5aea407614c1b295 /meta
parentc04f54352fd09782e7f3fff87f48ad90ae70dbfa (diff)
downloadpoky-1815a99f9fa290ae7dada90534b4d5db8e80a307.tar.gz
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. (From OE-Core rev: 1961ea1493caf5fe2959db2a11831a4a5a17eaeb) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa-8.0.4.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_git.bb3
-rw-r--r--meta/recipes-graphics/mesa/mesa-git.inc2
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 9afb35dee6..c6307dc603 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"
13SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e" 13SRC_URI[sha256sum] = "02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e"
14 14
15do_configure_prepend() { 15do_configure_prepend() {
16 #check for python not python2, because python-native does not stage python2 binary/link
17 sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
18 # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)" 16 # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
19 sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile 17 sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
20} 18}
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 bd62c98ce4..fb356764bf 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 @@
1require mesa-common.inc 1require mesa-common.inc
2require mesa-${PV}.inc 2require mesa-${PV}.inc
3require mesa-dri.inc 3require mesa-dri.inc
4PR = "${INC_PR}.1" 4PR = "${INC_PR}.2"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index 4b36f20beb..de1aa14cc1 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
5# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default 5# this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default
6DEFAULT_PREFERENCE = "-2" 6DEFAULT_PREFERENCE = "-2"
7 7
8PR = "${INC_PR}.0" 8PR = "${INC_PR}.1"
9
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index 7910eb654d..b907931b7b 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
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
18do_configure_prepend() { 18do_configure_prepend() {
19 #check for python not python2, because python-native does not stage python2 binary/link
20 sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
21 # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)" 19 # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
22 sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile 20 sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
23} 21}