summaryrefslogtreecommitdiffstats
path: root/package/gpsd/0001-Fix-build-error-when-ntpshm-is-false.patch
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2015-06-04 18:05:49 +0300
committerPeter Korsgaard <peter@korsgaard.com>2015-06-04 22:44:54 +0200
commit583edd3f865e1ba298d7e8fe765e27a0a0eb7069 (patch)
tree1267467e4f613d2bbe689cd3c01ba4ec49e5e93f /package/gpsd/0001-Fix-build-error-when-ntpshm-is-false.patch
parent8d8b0b0525e283a83aaf704915ea50d9da2d1dea (diff)
downloadbuildroot-583edd3f865e1ba298d7e8fe765e27a0a0eb7069.tar.gz
buildroot-583edd3f865e1ba298d7e8fe765e27a0a0eb7069.zip
gpsd: bump to version 3.15
Drop upstream patches #1 and #3. Drop the no longer needed patch #2. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/gpsd/0001-Fix-build-error-when-ntpshm-is-false.patch')
-rw-r--r--package/gpsd/0001-Fix-build-error-when-ntpshm-is-false.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/package/gpsd/0001-Fix-build-error-when-ntpshm-is-false.patch b/package/gpsd/0001-Fix-build-error-when-ntpshm-is-false.patch
deleted file mode 100644
index 9c444c415e..0000000000
--- a/package/gpsd/0001-Fix-build-error-when-ntpshm-is-false.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8e081f1bd5c82b842ee317cd55e70f646ae31f05 Mon Sep 17 00:00:00 2001
-From: Simon Dawson <spdawson@gmail.com>
-Date: Mon, 25 Aug 2014 10:26:11 +0100
-Subject: [PATCH] Fix build error when ntpshm is false
-To: gpsd-dev@nongnu.org
-
-The build fails as follows
-
-libgpsd_core.c: In function 'ntpshm_latch':
-libgpsd_core.c:1660:24: error: 'const struct gps_type_t' has no member named 'time_offset'
- || device->device_type->time_offset == NULL)
- ^
-libgpsd_core.c:1663:33: error: 'const struct gps_type_t' has no member named 'time_offset'
- fix_time += device->device_type->time_offset(device);
- ^
-scons: *** [libgpsd_core.os] Error 1
-
-The solution is to wrap #ifdef NTPSHM_ENABLE around the ntpshm_latch function
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
----
-diff -Nurp a/libgpsd_core.c b/libgpsd_core.c
---- a/libgpsd_core.c 2014-08-22 21:33:55.000000000 +0100
-+++ b/libgpsd_core.c 2014-09-03 18:48:34.184931741 +0100
-@@ -1642,6 +1642,7 @@ void gpsd_zero_satellites( /*@out@*/ str
- #endif
- }
-
-+#ifdef NTPSHM_ENABLE
- void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td)
- /* latch the fact that we've saved a fix */
- {
-@@ -1672,5 +1673,6 @@ void ntpshm_latch(struct gps_device_t *d
- device->last_fixtime.clock = td->clock.tv_sec + td->clock.tv_nsec / 1e9;
- #endif /* S_SPLINT_S */
- }
-+#endif /* NTPSHM_ENABLE */
-
- /* end */
OpenPOWER on IntegriCloud