Skip to contentSkip to conversation

gpsd: fix autobuild failures

PATCH New Simon Dawson 2 participants 2 messages Sep 3, 2014 – Sep 4, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpsd: fix autobuild failures

Add a gpsd patch sent upstream. Fixes, for example:

http://autobuild.buildroot.net/results/c68/c68203cc9cf59db0b645d1b20ee7bed4670bbbf0/

---
 ...d-01-Fix-build-error-when-ntpshm-is-false.patch | 17 +++------
 ...apping-of-ntpshm_latch-function-in-ifdef-.patch | 43 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 12 deletions(-)
 create mode 100644 package/gpsd/gpsd-03-Complete-wrapping-of-ntpshm_latch-function-in-ifdef-.patch
package/gpsd/gpsd-01-Fix-build-error-when-ntpshm-is-false.patch +5 -12
index d69d9e2..9c444c4 100644
@@ -19,14 +19,10 @@ The solution is to wrap #ifdef NTPSHM_ENABLE around the ntpshm_latch function
 
 Signed-off-by: Simon Dawson <[email protected]>
 ---
- libgpsd_core.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libgpsd_core.c b/libgpsd_core.c
-index 6ec08a4..f7e8075 100644
---- a/libgpsd_core.c
-+++ b/libgpsd_core.c
-@@ -1638,6 +1638,7 @@ void gpsd_zero_satellites( /*@out@*/ struct gps_data_t *out)
+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
  }
  
@@ -34,13 +30,10 @@ index 6ec08a4..f7e8075 100644
  void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td)
  /* latch the fact that we've saved a fix */
  {
-@@ -1668,5 +1669,6 @@ void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td)
+@@ -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 */
--- 
-1.9.1
-
package/gpsd/gpsd-03-Complete-wrapping-of-ntpshm_latch-function-in-ifdef-.patch new file +43 -0

43 lines not on this page · raw message

Signature · 1 line
1.9.1