summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/gpsd/0002-Fix-isync-build-when-ublox-not-selected-too.patch36
-rw-r--r--package/gpsd/Config.in5
-rw-r--r--package/gpsd/gpsd.mk3
3 files changed, 44 insertions, 0 deletions
diff --git a/package/gpsd/0002-Fix-isync-build-when-ublox-not-selected-too.patch b/package/gpsd/0002-Fix-isync-build-when-ublox-not-selected-too.patch
new file mode 100644
index 0000000000..1dfa9607e3
--- /dev/null
+++ b/package/gpsd/0002-Fix-isync-build-when-ublox-not-selected-too.patch
@@ -0,0 +1,36 @@
+From 98c8f5f4429ac3bfc09eee235fee08b9aaff8c52 Mon Sep 17 00:00:00 2001
+From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+Date: Tue, 30 Jan 2018 19:58:54 -0800
+Subject: [PATCH] Fix isync build when ublox not selected too.
+
+The isync support uses the ublox driver, but if the ublox support is
+disabled while isync is enabled, the build will fail.
+
+
+Upstream commit:
+http://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=98c8f5f4429ac3bfc09eee235fee08b9aaff8c52
+
+Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+---
+ SConstruct | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/SConstruct b/SConstruct
+index 1c1a215..c6a309e 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -334,6 +334,11 @@ for driver in ('ashtech',
+ env['nmea0183'] = True
+ break
+
++
++# iSync uses ublox underneath, so we force to enable it
++if env['isync']:
++ env['ublox'] = True
++
+ opts.Save('.scons-option-cache', env)
+ env.SConsignFile(".sconsign.dblite")
+
+--
+2.7.4
+
diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index 68d3e2e7e8..d9ab7b7dba 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -152,6 +152,11 @@ config BR2_PACKAGE_GPSD_GPSCLOCK
help
GPSClock support
+config BR2_PACKAGE_GPSD_ISYNC
+ bool "iSync"
+ help
+ Spectratime iSync LNRClok/GRCLOK support
+
config BR2_PACKAGE_GPSD_ITRAX
bool "iTrax"
help
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index e3fa20c430..8c8023e818 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -111,6 +111,9 @@ endif
ifneq ($(BR2_PACKAGE_GPSD_GPSCLOCK),y)
GPSD_SCONS_OPTS += gpsclock=no
endif
+ifneq ($(BR2_PACKAGE_GPSD_ISYNC),y)
+GPSD_SCONS_OPTS += isync=no
+endif
ifneq ($(BR2_PACKAGE_GPSD_ITRAX),y)
GPSD_SCONS_OPTS += itrax=no
endif
OpenPOWER on IntegriCloud