* it was causing staged python to be used as shebang Signed-off-by: Martin Jansa <martin.ja...@gmail.com> --- ...-the-same-Python-as-we-found-in-configure.patch | 39 ++++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 5 ++- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-the-same-Python-as-we-found-in-configure.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-the-same-Python-as-we-found-in-configure.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-the-same-Python-as-we-found-in-configure.patch new file mode 100644 index 0000000..e472680 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-the-same-Python-as-we-found-in-configure.patch @@ -0,0 +1,39 @@ +From cfafe51d344a9889e9ba041572fe20b582187a86 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.ja...@gmail.com> +Date: Wed, 18 Jul 2012 09:49:07 +0200 +Subject: [PATCH] Revert "Use the same Python as we found in configure" + +Upstream-Status: Pending + +This reverts commit c147bd5b1a0462fc9b107d1718826c6cad2a8ba5. +--- + gio/gdbus-2.0/codegen/Makefile.am | 2 +- + gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gio/gdbus-2.0/codegen/Makefile.am b/gio/gdbus-2.0/codegen/Makefile.am +index 9974005..cd9983e 100644 +--- a/gio/gdbus-2.0/codegen/Makefile.am ++++ b/gio/gdbus-2.0/codegen/Makefile.am +@@ -23,7 +23,7 @@ CLEANFILES += gdbus-codegen + EXTRA_DIST += gdbus-codegen.in + + gdbus-codegen: gdbus-codegen.in Makefile $(codegen_PYTHON) +- $(AM_V_GEN) sed -e 's,@libdir\@,$(libdir),' -e 's,@PYTHON\@,$(PYTHON),' $< > $@.tmp && mv $@.tmp $@ ++ $(AM_V_GEN) sed -e 's,@libdir\@,$(libdir),' $< > $@.tmp && mv $@.tmp $@ + @chmod a+x $@ + + clean-local: +diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in +index 217c755..ae900bb 100644 +--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in ++++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/env python + + # GDBus - GLib D-Bus Library + # +-- +1.7.8.6 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb index 85352ed..58eaa23 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb @@ -1,6 +1,6 @@ require glib.inc -PR = "r1" +PR = "r2" PE = "1" DEPENDS += "libffi python-argparse-native zlib" @@ -19,7 +19,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ SRC_URI[md5sum] = "bf84fefd9c1a5b5a7a38736f4ddd674a" SRC_URI[sha256sum] = "a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2" -SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" +SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" +SRC_URI_append_class-target = " file://0001-Revert-Use-the-same-Python-as-we-found-in-configure.patch" BBCLASSEXTEND = "native nativesdk" PERLPATH = "${bindir}/env perl" -- 1.7.8.6 _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core