summaryrefslogtreecommitdiffstats
path: root/package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch
diff options
context:
space:
mode:
authorSimon Dawson <spdawson@gmail.com>2014-01-04 11:08:36 +0000
committerPeter Korsgaard <peter@korsgaard.com>2014-01-04 21:06:01 +0100
commit05eba6c79ea05bcc3acea6e1cec7612efade265b (patch)
treeab0126d5630085354fe2a2243f14e793ff173730 /package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch
parent38332d86ac07b34c8c925a650073848725dab948 (diff)
downloadbuildroot-05eba6c79ea05bcc3acea6e1cec7612efade265b.tar.gz
buildroot-05eba6c79ea05bcc3acea6e1cec7612efade265b.zip
gpsd: bump git snapshot
The 3.11 release of gpsd still hasn't materialised. For now, bump the Git snapshot again, removing local patches that have now been merged upstream. Signed-off-by: Simon Dawson <spdawson@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch')
-rw-r--r--package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch b/package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch
deleted file mode 100644
index 1e216f8fe4..0000000000
--- a/package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-When reconfigure is false, the link step fails as follows.
-
-/scratch/peko/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -o gpsd -pthread --sysroot=/scratch/peko/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot gpsd.o ntpshm.o shmexport.o dbusexport.o -L. -L/scratch/peko/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lrt -lbluetooth -ldbus-1 -lgpsd -lusb-1.0 -lbluetooth -lgps -lm -ldbus-1 -lpthread -lrt
-./libgpsd.so: undefined reference to `ubx_mode'
-collect2: error: ld returned 1 exit status
-scons: *** [gpsd] Error 1
-scons: building terminated because of errors.
-
-The problem appears to be a failure to guard a call to ubx_mode with a
-RECONFIGURE_ENABLE ifdef.
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
----
- driver_ubx.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/driver_ubx.c b/driver_ubx.c
-index d75bbf8..9554a96 100644
---- a/driver_ubx.c
-+++ b/driver_ubx.c
-@@ -68,7 +68,9 @@ static gps_mask_t ubx_msg_nav_svinfo(struct gps_device_t *session,
- unsigned char *buf, size_t data_len);
- static void ubx_msg_sbas(struct gps_device_t *session, unsigned char *buf);
- static void ubx_msg_inf(unsigned char *buf, size_t data_len, const int debug);
-+#ifdef RECONFIGURE_ENABLE
- static void ubx_mode(struct gps_device_t *session, int mode);
-+#endif /* RECONFIGURE_ENABLE */
-
- /**
- * Navigation solution message
-@@ -645,12 +647,14 @@ static void ubx_event_hook(struct gps_device_t *session, event_t event)
- (void)ubx_write(session, UBX_CLASS_MON, 0x04, msg, 0);
- /*@ +type @*/
-
-+#ifdef RECONFIGURE_ENABLE
- /*
- * Turn off NMEA output, turn on UBX on this port.
- */
- if (session->mode == O_OPTIMIZE) {
- ubx_mode(session, MODE_BINARY);
- }
-+#endif /* RECONFIGURE_ENABLE */
- } else if (event == event_deactivate) {
- /*@ -type @*/
- unsigned char msg[4] = {
---
-1.8.3.2
-
OpenPOWER on IntegriCloud