[Git][NTPsec/ntpsec][master] 3 commits: Fix typo in NTPS_VERSION_MINOR
Hal Murray
gitlab at mg.gitlab.com
Thu Feb 11 10:19:08 UTC 2016
Hal Murray pushed to branch master at NTPsec / ntpsec
Commits:
301f7420 by Hal Murray at 2016-02-10T23:40:01-08:00
Fix typo in NTPS_VERSION_MINOR
- - - - -
1ca2e26c by Hal Murray at 2016-02-10T23:49:15-08:00
Add sys/time.h to places that use sys/timex.h
Needed by NetBSD and FreeBSD 9
FreeBSD 10 is OK
- - - - -
ff3f2aba by Hal Murray at 2016-02-11T00:53:32-08:00
Remove HGM comments from pylib/configure.py
A while ago, I removed some unused tests.
I did it by commenting them out rather than actually
deleting them so it would be easier to recover in case
something turned out to be required.
Since there haven't been any problems, this is the actual delete.
- - - - -
3 changed files:
- − pylib/check_timepps.py
- pylib/configure.py
- wscript
Changes:
=====================================
pylib/check_timepps.py deleted
=====================================
--- a/pylib/check_timepps.py
+++ /dev/null
@@ -1,30 +0,0 @@
-TIMEPPS_FRAG = """
-#include <sys/types.h>
-
-#ifdef HAVE_TIMEPPS_H
-# include <timepps.h>
-#else
-# ifdef HAVE_SYS_TIMEPPS_H
-# include <sys/time.h> /* Needed on NetBSD */
-# include <sys/timepps.h>
-# endif
-#endif
-
-int main(void) {
- pps_handle_t pps_h;
- time_pps_destroy (pps_h);
-
- return 0;
-}
-"""
-
-
-def check_timepps(ctx):
- ctx.check_cc(
- fragment = TIMEPPS_FRAG,
- define_name = "HAVE_PPSAPI",
- features = "c",
- msg = "Checking if PPS API works",
- mandatory = False
- )
-
=====================================
pylib/configure.py
=====================================
--- a/pylib/configure.py
+++ b/pylib/configure.py
@@ -183,8 +183,6 @@ def cmd_configure(ctx):
# int32_t and uint32_t probes aren't really needed, POSIX guarantees
# them. But int64_t and uint64_t are not guaranteed to exist on 32-bit
# machines.
-#HGM types = ["int32_t", "uint32_t", "int64_t", "uint64_t",
-#HGM "uint_t", "size_t", "wint_t", "pid_t", "intptr_t", "uintptr_t"]
# Used by timevalops and timespecops in tests/libntp/
# May go away when that is cleaned up.
types = ["uint64_t"]
@@ -200,7 +198,7 @@ def cmd_configure(ctx):
ctx.check_type(f, h)
structures = (
- ("struct timex", ["sys/timex.h"]),
+ ("struct timex", ["sys/time.h", "sys/timex.h"]),
("struct ntptimeval", ["sys/time.h", "sys/timex.h"]),
)
for (s, h) in structures:
@@ -218,11 +216,8 @@ def cmd_configure(ctx):
sizeofs = [
("time.h", "time_t"),
(None, "int"),
-#HGM (None, "short"),
(None, "long"),
(None, "long long"),
-#HGM ("pthread.h", "pthread_t"),
-#HGM (None, "signed char"),
]
for header, sizeof in sorted(sizeofs):
@@ -235,7 +230,6 @@ def cmd_configure(ctx):
ctx.define("GETSOCKNAME_SOCKLEN_TYPE", "socklen_t", quote=False)
ctx.define("DFLT_RLIMIT_STACK", 50)
ctx.define("DFLT_RLIMIT_MEMLOCK", 32)
-#HGM ctx.define("POSIX_SHELL", "/bin/sh")
ctx.define("OPENSSL_VERSION_TEXT", "#XXX: Fixme")
@@ -268,14 +262,11 @@ def cmd_configure(ctx):
# we're likely to duplicate them.
functions = (
('adjtimex', ["sys/time.h", "sys/timex.h"]),
-#HGM ('arc4random', ["stdlib.h"]),
-#HGM ('arc4random_buf', ["stdlib.h"]),
('closefrom', ["stdlib.h"]),
('clock_gettime', ["time.h"], "RT"),
('clock_settime', ["time.h"], "RT"),
('EVP_MD_do_all_sorted', ["openssl/evp.h"], "CRYPTO"),
('getclock', ["sys/timers.h"]),
-#HGM ('getdtablesize', ["unistd.h"]), # SVr4, 4.2BSD
('getpassphrase', ["stdlib.h"]), # Sun systems
('MD5Init', ["md5.h"], "CRYPTO"),
('ntp_adjtime', ["sys/time.h", "sys/timex.h"]), # BSD
@@ -286,7 +277,6 @@ def cmd_configure(ctx):
('settimeofday', ["sys/time.h"], "RT"), # BSD
('strlcpy', ["string.h"]),
('strlcat', ["string.h"]),
-#HGM ('sysconf', ["unistd.h"]),
('timer_create', ["time.h"])
)
for ft in functions:
@@ -313,13 +303,9 @@ def cmd_configure(ctx):
# Some of these are cruft from ancient big-iron systems and should
# be removed.
optional_headers = (
-#HGM "alloca.h",
-#HGM "arpa/nameser.h",
"dns_sd.h", # NetBSD, Apple, mDNS
"histedit.h", # Apple
-#HGM "ieeefp.h", # x86, depricated by FreeBSD
("ifaddrs.h", ["sys/types.h"]),
-#HGM "libintl.h",
"libscf.h", # Solaris
"linux/if_addr.h",
"linux/rtnetlink.h",
@@ -341,15 +327,13 @@ def cmd_configure(ctx):
"sys/ioctl.h",
"sys/modem.h", # Apple
"sys/prctl.h", # Linux
-#HGM "sys/procset.h",
"sys/sockio.h",
"sys/soundcard.h",
("sys/sysctl.h", ["sys/types.h"]),
-#HGM "sys/systune.h",
("timepps.h", ["inttypes.h"]),
("sys/timepps.h", ["inttypes.h", "sys/time.h"]),
"utmpx.h", # missing on RTEMS and OpenBSD
- "sys/timex.h",
+ ("sys/timex.h", ["sys/time.h"]),
"sys/audio.h"
)
for hdr in optional_headers:
@@ -365,9 +349,6 @@ def cmd_configure(ctx):
print "Compilation check failed but include exists %s" % hdr
if ctx.get_define("HAVE_TIMEPPS_H") or ctx.get_define("HAVE_SYS_TIMEPPS_H"):
-#HGM from pylib.check_timepps import check_timepps
-#HGM check_timepps(ctx)
-#HGM Can delete pylib/check_timepps.py
ctx.define("HAVE_PPSAPI", 1)
@@ -378,11 +359,6 @@ def cmd_configure(ctx):
from check_sockaddr import check_sockaddr
check_sockaddr(ctx)
-#HGM from check_posix_thread_version import check_posix_thread_version
-
-#HGM check_posix_thread_version(ctx)
-#HGM ctx.define('HAVE_PTHREADS', ctx.env.POSIX_THREAD_VERISON)
-
# Some systems don't have sys/timex.h eg OS X, OpenBSD...
if ctx.get_define("HAVE_SYS_TIMEX_H"):
ctx.env.HEADER_SYS_TIMEX_H = True
=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -130,7 +130,7 @@ def configure(ctx):
ctx.env.NTPS_VERSION = "%s.%s.%s" % (ctx.env.NTPS_VERSION_MAJOR, ctx.env.NTPS_VERSION_MINOR, ctx.env.NTPS_VERSION_REV)
ctx.define("NTPS_VERSION_MAJOR", ctx.env.NTPS_VERSION_MAJOR)
- ctx.define("NTPS_VERSION_MINOR", ctx.env.NTPS_VERSION_REV)
+ ctx.define("NTPS_VERSION_MINOR", ctx.env.NTPS_VERSION_MINOR)
ctx.define("NTPS_VERSION_REV", ctx.env.NTPS_VERSION_REV)
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/d4cf864894037043831734fa7d9f58482bfe9049...ff3f2aba33ed948376978c2131c8fd51e50f3568
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160211/2d32f2db/attachment.html>
More information about the vc
mailing list