summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary E. Miller <gem@rellim.com>2018-09-27 18:44:37 -0700
committerGary E. Miller <gem@rellim.com>2018-09-27 18:44:37 -0700
commit478a0c0e9b4e8e1c1136696780094a0a7d3e5488 (patch)
tree022df92b9ea605f3b7c4ff8b0d53a6fc9f634f1b
parenta7dadaba753e16f7c530aa5c9dd6358008d5ea30 (diff)
downloadgpsd-478a0c0e9b4e8e1c1136696780094a0a7d3e5488.tar.gz
Revert "Disables xgps[speed] -V in python-versions check."
This reverts commit 8364908d0a3b922643c2f64bfeed3a26ed3a9552. This breaks new regression tests.
-rw-r--r--SConstruct8
1 files changed, 1 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct
index 7293b155..72eedd14 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1899,15 +1899,9 @@ if python_progs:
# get version from each python prog
# this ensures they can run and gps_versions match
- # However, xgps[speed] -V requires (possibly launching) a usable X11 server,
- # and takes significant time time to connect to it, so we skip checking
- # those until that's fixed.
vchk = ''
for prog in python_progs:
- if prog not in ['xgps', 'xgpsspeed']:
- vchk += '$SRCDIR/%s -V\n' % prog
- else:
- vchk += '# %s -V not checked due to X11 dependency\n' % prog
+ vchk += '$SRCDIR/%s -V\n' % prog
python_versions = Utility('python-versions', [python_progs], vchk)
else: