From 07e502689fb78e55732fe0ad9b725a9dd4363804 Mon Sep 17 00:00:00 2001 From: Simon Dawson Date: Sat, 23 Nov 2013 11:35:25 +0000 Subject: [PATCH] gpsd: bump version to 3.10 Signed-off-by: Simon Dawson Signed-off-by: Peter Korsgaard --- .../gpsd/gpsd-02-sconstruct-disable-rpath.patch | 15 +++++++-------- package/gpsd/gpsd.mk | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch b/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch index 5476450e49..eca3cbfb08 100644 --- a/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch +++ b/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch @@ -2,14 +2,13 @@ Disable addition of RPATH to the generated libraries Signed-off-by: Thomas Petazzoni -Index: b/SConstruct -=================================================================== ---- a/SConstruct -+++ b/SConstruct -@@ -273,8 +273,6 @@ - env.Prepend(LIBPATH=[installdir('libdir')]) - else: - env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')]) +diff -Nurp a/SConstruct b/SConstruct +--- a/SConstruct 2013-11-22 13:10:01.000000000 +0000 ++++ b/SConstruct 2013-11-23 11:26:57.698486777 +0000 +@@ -287,8 +287,6 @@ def installdir(dir, add_destdir=True): + # Honor the specified installation prefix in link paths. + if env["sysroot"]: + env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir', add_destdir=False)]) -if env["shared"]: - env.Prepend(RPATH=[installdir('libdir')]) diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index be2e681c42..92db00edb7 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSD_VERSION = 3.9 +GPSD_VERSION = 3.10 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd/ GPSD_LICENSE = BSD-3c GPSD_LICENSE_FILES = COPYING -- 2.30.2