aboutsummaryrefslogtreecommitdiff
path: root/package/gpsd
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2013-12-01 20:31:43 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2013-12-01 20:32:00 +0100
commit50ce7ffb76b989c90636876153e568da7615b8c3 (patch)
tree1de9424dd5332431d2a30d3aafe332e7c0999476 /package/gpsd
parent9b3904543ca04c5d5fe5f6974539eed376de2290 (diff)
parentcb08d7b05db54eb7b2c52deabbd57c541777a422 (diff)
downloadbuildroot-50ce7ffb76b989c90636876153e568da7615b8c3.tar.gz
buildroot-50ce7ffb76b989c90636876153e568da7615b8c3.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/gpsd')
-rw-r--r--package/gpsd/gpsd-02-sconstruct-disable-rpath.patch15
-rw-r--r--package/gpsd/gpsd.mk2
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 <thomas.petazzoni@free-electrons.com>
-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