summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-09-22 10:51:22 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 04:50:09 +0100
commita502a1848460b2cc79b2eca4af803953fc85e4d5 (patch)
treeda211a1b3764a6275f869cdc46158ecc27f75e0b
parentee6e30adc38129096bd698b5ae2618c4b6b51717 (diff)
downloadpoky-a502a1848460b2cc79b2eca4af803953fc85e4d5.tar.gz
libglade: fix the python environment settings
@PYTHON@ will points to the abstract path in sysroot, which should be replaced by "#!/usr/bin/env python". This should fix the sato-sdk rootfs error. (From OE-Core rev: 51cd0bdf1fad230e919392db8c72afe2d9e21fdb) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch14
-rw-r--r--meta/recipes-gnome/libglade/libglade_2.6.4.bb4
2 files changed, 16 insertions, 2 deletions
diff --git a/meta/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch b/meta/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch
new file mode 100644
index 0000000000..b4ca49de25
--- /dev/null
+++ b/meta/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch
@@ -0,0 +1,14 @@
1Using @PYTHON@ for this path would result in the build system python being
2referred to. Instead we want to locate python from the environment.
3
4Upstream Status: Inappropriate [configuration]
5
6diff -ruN libglade-2.6.4-orig//libglade-convert.in libglade-2.6.4/libglade-convert.in
7--- libglade-2.6.4-orig//libglade-convert.in 2011-09-22 10:18:28.991164003 +0800
8+++ libglade-2.6.4/libglade-convert.in 2011-09-22 10:18:55.431164003 +0800
9@@ -1,4 +1,4 @@
10-#!@PYTHON@
11+#!/usr/bin/env python
12 # -*- mode: python -*-
13
14 # yes, this requires python 2.x and an XML parser module (eg. PyExpat)
diff --git a/meta/recipes-gnome/libglade/libglade_2.6.4.bb b/meta/recipes-gnome/libglade/libglade_2.6.4.bb
index d5b41f29fd..b0e0339554 100644
--- a/meta/recipes-gnome/libglade/libglade_2.6.4.bb
+++ b/meta/recipes-gnome/libglade/libglade_2.6.4.bb
@@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
8 file://glade/glade-gtk.c;endline=22;md5=766f993433e2642fec87936d319990ff" 8 file://glade/glade-gtk.c;endline=22;md5=766f993433e2642fec87936d319990ff"
9 9
10SECTION = "libs" 10SECTION = "libs"
11PR = "r0" 11PR = "r1"
12DEPENDS = "gtk+ gtk-doc-native" 12DEPENDS = "gtk+ gtk-doc-native"
13 13
14inherit autotools pkgconfig gnome 14inherit autotools pkgconfig gnome
15 15
16SRC_URI += "file://glade-cruft.patch file://no-xml2.patch" 16SRC_URI += "file://glade-cruft.patch file://no-xml2.patch file://python_environment.patch"
17 17
18SRC_URI[archive.md5sum] = "d1776b40f4e166b5e9c107f1c8fe4139" 18SRC_URI[archive.md5sum] = "d1776b40f4e166b5e9c107f1c8fe4139"
19SRC_URI[archive.sha256sum] = "64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec" 19SRC_URI[archive.sha256sum] = "64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec"