mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 14:19:52 +00:00
gpsd: fix build with python2.7 in sysroot and python2.6 on host
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -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
|
||||||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
|
|||||||
DEPENDS = "dbus-glib ncurses python libusb1"
|
DEPENDS = "dbus-glib ncurses python libusb1"
|
||||||
PROVIDES = "virtual/gpsd"
|
PROVIDES = "virtual/gpsd"
|
||||||
|
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
|
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
|
||||||
--x-libraries=${STAGING_LIBDIR} \
|
--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 \
|
SRC_URI = "http://download.berlios.de/${PN}/${P}.tar.gz;name=gpsd \
|
||||||
file://libtool.patch \
|
file://libtool.patch \
|
||||||
|
file://fix-build-with-python2.7.patch \
|
||||||
file://gpsd-default \
|
file://gpsd-default \
|
||||||
file://gpsd \
|
file://gpsd \
|
||||||
file://60-gpsd.rules"
|
file://60-gpsd.rules"
|
||||||
|
|||||||
Reference in New Issue
Block a user