From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH 2/2] gpsd: fix build with python2.7 in sysroot and python2.6 on host
Date: Mon, 31 Oct 2011 18:35:46 +0100 [thread overview]
Message-ID: <1320082546-31376-2-git-send-email-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <1320082546-31376-1-git-send-email-Martin.Jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../gpsd/gpsd-2.95/fix-build-with-python2.7.patch | 15 +++++++++++++++
meta-oe/recipes-navigation/gpsd/gpsd_2.95.bb | 3 ++-
2 files changed, 17 insertions(+), 1 deletions(-)
create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-2.95/fix-build-with-python2.7.patch
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-2.95/fix-build-with-python2.7.patch b/meta-oe/recipes-navigation/gpsd/gpsd-2.95/fix-build-with-python2.7.patch
new file mode 100644
index 0000000..6bba2b8
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd-2.95/fix-build-with-python2.7.patch
@@ -0,0 +1,15 @@
+Without this patch python2.6 from host could be preferred over python from native sysroot.
+
+Upstream-Status: Pending
+diff -uNr gpsd-2.95.orig/configure.ac gpsd-2.95/configure.ac
+--- gpsd-2.95.orig/configure.ac 2011-10-31 18:26:08.860719033 +0100
++++ gpsd-2.95/configure.ac 2011-10-31 18:27:47.718716963 +0100
+@@ -31,7 +31,7 @@
+ dnl AM_PATH_PYTHON provided with automake can be too old. Look
+ dnl for newer python first, and include 2.6 on the list.
+ m4_define([_AM_PYTHON_INTERPRETER_LIST],
+- [python2.6 python2.5 python2.4 python])
++ [python2.7 python2.6 python2.5 python2.4 python])
+ AM_PATH_PYTHON([2.4])
+ ac_python=yes
+ if test "x$PYTHON" = "x"; then
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_2.95.bb b/meta-oe/recipes-navigation/gpsd/gpsd_2.95.bb
index a6bf308..cdcb77c 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_2.95.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_2.95.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
DEPENDS = "dbus-glib ncurses python libusb1"
PROVIDES = "virtual/gpsd"
-PR = "r1"
+PR = "r2"
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
@@ -15,6 +15,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
SRC_URI = "http://download.berlios.de/${PN}/${P}.tar.gz;name=gpsd \
file://libtool.patch \
+ file://fix-build-with-python2.7.patch \
file://gpsd-default \
file://gpsd \
file://60-gpsd.rules"
--
1.7.7.1
prev parent reply other threads:[~2011-10-31 17:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-31 17:35 [PATCH 1/2] recipes: bump PR after python upgrade Martin Jansa
2011-10-31 17:35 ` Martin Jansa [this message]
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=1320082546-31376-2-git-send-email-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.