diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-31 18:31:07 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-11-01 09:57:03 +0100 |
| commit | 1fd4003f9abe1c5c165f75e0cea5c1f6bb0990be (patch) | |
| tree | f542a81c4eb39472f981a1df92dbfbe053d6c59a /meta-oe/recipes-navigation/gpsd | |
| parent | 396550a39aca43b0694c5dc26f44005a4a416645 (diff) | |
| download | meta-openembedded-1fd4003f9abe1c5c165f75e0cea5c1f6bb0990be.tar.gz | |
gpsd: fix build with python2.7 in sysroot and python2.6 on host
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation/gpsd')
| -rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-2.95/fix-build-with-python2.7.patch | 15 | ||||
| -rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd_2.95.bb | 3 |
2 files changed, 17 insertions, 1 deletions
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 0000000000..6bba2b8600 --- /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 a6bf308dda..cdcb77c2a4 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" |