diff options
| author |   Dongxiao Xu <dongxiao.xu@intel.com> | 2011-09-22 10:51:22 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-22 04:48:53 +0100 |
| commit | 51cd0bdf1fad230e919392db8c72afe2d9e21fdb (patch) | |
| tree | 4ed9ebc17d26ccf12128d618f1a14d364d2c1cdd /meta/recipes-gnome | |
| parent | 08fd9740b9359425ec6ee9810fab1152e9737b0c (diff) | |
| download | openembedded-core-contrib-51cd0bdf1fad230e919392db8c72afe2d9e21fdb.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.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
| -rw-r--r-- | meta/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-gnome/libglade/libglade_2.6.4.bb | 4 |
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 @@ +Using @PYTHON@ for this path would result in the build system python being +referred to. Instead we want to locate python from the environment. + +Upstream Status: Inappropriate [configuration] + +diff -ruN libglade-2.6.4-orig//libglade-convert.in libglade-2.6.4/libglade-convert.in +--- libglade-2.6.4-orig//libglade-convert.in 2011-09-22 10:18:28.991164003 +0800 ++++ libglade-2.6.4/libglade-convert.in 2011-09-22 10:18:55.431164003 +0800 +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/env python + # -*- mode: python -*- + + # 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 \ file://glade/glade-gtk.c;endline=22;md5=766f993433e2642fec87936d319990ff" SECTION = "libs" -PR = "r0" +PR = "r1" DEPENDS = "gtk+ gtk-doc-native" inherit autotools pkgconfig gnome -SRC_URI += "file://glade-cruft.patch file://no-xml2.patch" +SRC_URI += "file://glade-cruft.patch file://no-xml2.patch file://python_environment.patch" SRC_URI[archive.md5sum] = "d1776b40f4e166b5e9c107f1c8fe4139" SRC_URI[archive.sha256sum] = "64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec" |