package/gpsd: fix isync build without nmea
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Sun, 9 Jun 2019 21:52:41 +0000 (23:52 +0200)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Sun, 9 Jun 2019 22:28:33 +0000 (00:28 +0200)
Upstream suggested to move the definition of NMEA_DOLLAR out of the
ifdef.

Fixes:
 - http://autobuild.buildroot.org/results/7757ff82623eb5db8cbd9cdf69baf308fd0b0666

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
package/gpsd/0004-packet_states.h-fix-isync-build-without-NMEA.patch [new file with mode: 0644]

diff --git a/package/gpsd/0004-packet_states.h-fix-isync-build-without-NMEA.patch b/package/gpsd/0004-packet_states.h-fix-isync-build-without-NMEA.patch
new file mode 100644 (file)
index 0000000..1a36bc8
--- /dev/null
@@ -0,0 +1,37 @@
+From a6561fbf2a53972e552b1619c8711092c72c2199 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 9 Jun 2019 11:52:55 +0200
+Subject: [PATCH] packet_states.h: fix isync build without NMEA
+
+Build fails if isync is enabled without nmea because NMEA_DOLLAR is not
+defined.
+
+Fix this build failure by always defining NMEA_DOLLAR
+
+Fixes:
+ - http://autobuild.buildroot.org/results/7757ff82623eb5db8cbd9cdf69baf308fd0b0666
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://gitlab.com/gpsd/gpsd/merge_requests/11]
+---
+ packet_states.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packet_states.h b/packet_states.h
+index 4c3a3208..0adbeb1d 100644
+--- a/packet_states.h
++++ b/packet_states.h
+@@ -3,9 +3,9 @@
+    COMMENT_BODY,      /* pound comment for a test load */
+    COMMENT_RECOGNIZED,        /* comment recognized */
++   NMEA_DOLLAR,               /* we've seen first character of NMEA leader */
+ #ifdef NMEA0183_ENABLE
+-   NMEA_DOLLAR,               /* we've seen first character of NMEA leader */
+    NMEA_BANG,         /* we've seen first character of an AIS message '!' */
+    NMEA_PUB_LEAD,     /* seen second character of NMEA G leader */
+    NMEA_VENDOR_LEAD,  /* seen second character of NMEA P leader */
+-- 
+2.20.1
+