Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] glib-2.0: revert one commit in target recipe
Date: Wed, 18 Jul 2012 11:17:19 +0200	[thread overview]
Message-ID: <1342603039-6608-1-git-send-email-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <20120718010511.GH22569@jama.jama.net>

* it was causing staged python to be used as shebang

Signed-off-by: Martin Jansa <Martin.Jansa@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.Jansa@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




  reply	other threads:[~2012-07-18  9:28 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-17 21:58 Master Failures Saul Wold
2012-07-18  0:26 ` Saul Wold
2012-07-18  0:38   ` Martin Jansa
2012-07-18  0:52     ` Glib-2.0 cross-compile issue Was: " Martin Jansa
2012-07-18  0:57       ` Saul Wold
2012-07-18  1:01       ` Colin Walters
2012-07-18  1:05         ` Martin Jansa
2012-07-18  9:17           ` Martin Jansa [this message]
2012-07-18 21:25             ` [PATCH] glib-2.0: revert one commit in target recipe Richard Purdie
2012-07-18  9:25   ` Master Failures Paul Eggleton
2012-07-18  9:36 ` Burton, Ross

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1342603039-6608-1-git-send-email-Martin.Jansa@gmail.com \
    --to=martin.jansa@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox