6b6255bf94
The 3.11 release of gpsd is imminent; in the meantime, backport some patches from upstream to fix some of the autobuild failures. Also bump to the most recent Git snapshot. Signed-off-by: Simon Dawson <spdawson@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
When reconfigure is False and ncurses support is enabled, the build fails as
|
|
follows.
|
|
|
|
gpsmon.o: In function `gpsd_write':
|
|
gpsmon.c:(.text+0xbbc): undefined reference to `monitor_dump_send'
|
|
gpsmon.o: In function `main':
|
|
gpsmon.c:(.text.startup+0xd68): undefined reference to `announce_log'
|
|
collect2: error: ld returned 1 exit status
|
|
scons: *** [gpsmon] Error 1
|
|
scons: building terminated because of errors.
|
|
|
|
The problem appears to be a failure to protect calls to momnitor_dump_send
|
|
and announce_log with appropriate #ifdef guards.
|
|
|
|
Signed-off-by: Simon Dawson <spdawson@gmail.com>
|
|
---
|
|
gpsmon.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/gpsmon.c b/gpsmon.c
|
|
index 106e080..de1f14b 100644
|
|
--- a/gpsmon.c
|
|
+++ b/gpsmon.c
|
|
@@ -632,7 +632,9 @@ ssize_t gpsd_write(struct gps_device_t *session,
|
|
const size_t len)
|
|
/* pass low-level data to devices, echoing it to the log window */
|
|
{
|
|
+#if defined(CONTROLSEND_ENABLE) || defined(RECONFIGURE_ENABLE)
|
|
monitor_dump_send((const char *)buf, len);
|
|
+#endif /* defined(CONTROLSEND_ENABLE) || defined(RECONFIGURE_ENABLE) */
|
|
return gpsd_serial_write(session, buf, len);
|
|
}
|
|
|
|
@@ -823,7 +825,9 @@ static bool do_command(const char *line)
|
|
context.readonly = !context.readonly;
|
|
else
|
|
context.readonly = (atoi(line + 1) == 0);
|
|
+#ifdef RECONFIGURE_ENABLE
|
|
announce_log("[probing %sabled]", context.readonly ? "dis" : "en");
|
|
+#endif /* RECONFIGURE_ENABLE */
|
|
if (!context.readonly)
|
|
/* magic - forces a reconfigure */
|
|
session.packet.counter = 0;
|
|
--
|
|
1.8.3.2
|
|
|