[ntpsec commit] Fix building of utils.
Amar Takhar
amar at ntpsec.org
Tue Oct 13 20:14:55 UTC 2015
Module: ntpsec
Branch: master
Commit: 777194a28a700f5b9350e93602de27055ac1363a
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=777194a28a700f5b9350e93602de27055ac1363a
Author: Amar Takhar <verm at darkbeer.org>
Date: Tue Oct 13 16:14:36 2015 -0400
Fix building of utils.
This needs work to add a proper test for tv_usec.
---
pylib/configure.py | 7 +++++++
util/wscript | 8 ++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/pylib/configure.py b/pylib/configure.py
index d6d8f8c..8094691 100644
--- a/pylib/configure.py
+++ b/pylib/configure.py
@@ -449,6 +449,13 @@ def cmd_configure(ctx):
ctx.define("HAVE_IFLIST_SYSCTL", 1)
+ # Build settings for util/
+ if ctx.get_define("HAVE_SYS_TIMEPPS_H"):
+ ctx.env.HAVE_TIMEPPS = True
+
+ if ctx.get_define("HAVE_ADJTIMEX"):
+ ctx.env.HAVE_ADJTIMEX = True
+
ctx.start_msg("Writing configuration header:")
ctx.write_config_header("config.h")
diff --git a/util/wscript b/util/wscript
index 8a9cf2e..2794ce2 100644
--- a/util/wscript
+++ b/util/wscript
@@ -5,12 +5,12 @@ def build(ctx):
bldnode = ctx.bldnode.abspath()
util = ['hist', 'jitter', 'precision', 'propdelay',
- 'ntptime', 'sht', 'testrs6000', 'tg2']
+ 'sht', 'testrs6000', 'tg2']
- if ctx.get_define("HAVE_SYS_TIMEPPS_H"):
- util += ["pps-api"]
+ if ctx.env.PLATFORM_TARGET != "freebsd": # XXX: fix this using a test in configure().
+ util += ["pps-api", "ntptime"]
- if ctx.get_define("HAVE_ADJTIMEX"):
+ if ctx.env.HAVE_ADJTIMEX:
util += ["ntptickadj"]
for name in util:
More information about the vc
mailing list