<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<div class='content'>
<h3>
Amar Takhar pushed to branch master
at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/1d2ab8fb9b730b25f608917364db23cc8a3dfede">1d2ab8fb</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2016-02-06T16:16:04-05:00</i>
</div>
<pre class='commit-message'>Further support for OpenBSD and make a few checks more robust.
* Rather than explicitly listing platforms change it to check for the headers
* Add OpenBSD to the list of detected platforms.
* Add pthread.h to ntp_worker.h wrapped with PLATFORM_OPENBSD
Updates #31</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/e9da97da22549863a98c65c7ccb52a77c9dbe4b1">e9da97da</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2016-02-06T16:16:47-05:00</i>
</div>
<pre class='commit-message'>OpenBSD requires curses for readline.
* Readline is also a separate library.
Fixes #31</pre>
</li>
</ul>
<h4>5 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
include/ntp_worker.h
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
ntpq/wscript
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
ntptime/wscript
</a>
</li>
<li class='file-stats'>
<a href='#diff-3'>
pylib/configure.py
</a>
</li>
<li class='file-stats'>
<a href='#diff-4'>
util/wscript
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/fa1cc41ad5b69f129d143c9f7a8ddbb532052acc...e9da97da22549863a98c65c7ccb52a77c9dbe4b1#diff-0'>
<strong>
include/ntp_worker.h
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/include/ntp_worker.h
</span><span style="color: #000000;background-color: #ddffdd">+++ b/include/ntp_worker.h
</span><span style="color: #aaaaaa">@@ -7,6 +7,11 @@
</span>
#include "ntp_workimpl.h"
<span style="color: #000000;background-color: #ddffdd">+/* XXX: Why does OpenBSD need pthread.h here? */
+#ifdef PLATFORM_OPENBSD
+#include <pthread.h>
+#endif
+
</span> #ifdef USE_WORKER
# if defined(USE_WORK_THREAD) && defined(USE_WORK_PIPE)
# ifdef HAVE_SEMAPHORE_H
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/fa1cc41ad5b69f129d143c9f7a8ddbb532052acc...e9da97da22549863a98c65c7ccb52a77c9dbe4b1#diff-1'>
<strong>
ntpq/wscript
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntpq/wscript
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntpq/wscript
</span><span style="color: #aaaaaa">@@ -26,7 +26,7 @@ def build(ctx):
</span> target = "ntpq",
features = "c cprogram bld_include src_include libisc_include ntp_version",
source = ntpq_source,
<span style="color: #000000;background-color: #ffdddd">- use = "ntp opts isc M RT READLINE EDIT PTHREAD CRYPTO",
</span><span style="color: #000000;background-color: #ddffdd">+ use = "ntp opts isc M RT READLINE EDIT PTHREAD CRYPTO CURSES READLINE",
</span> includes = [
"%s/ntpq/" % bldnode
],
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/fa1cc41ad5b69f129d143c9f7a8ddbb532052acc...e9da97da22549863a98c65c7ccb52a77c9dbe4b1#diff-2'>
<strong>
ntptime/wscript
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/ntptime/wscript
</span><span style="color: #000000;background-color: #ddffdd">+++ b/ntptime/wscript
</span><span style="color: #aaaaaa">@@ -1,7 +1,7 @@
</span> from waflib import Utils
def build(ctx):
<span style="color: #000000;background-color: #ffdddd">- if ctx.env.PLATFORM_TARGET not in ['osx']:
</span><span style="color: #000000;background-color: #ddffdd">+ if ctx.env.HEADER_SYS_TIMEX_H:
</span> srcnode = ctx.srcnode.abspath()
bldnode = ctx.bldnode.abspath()
</code></pre>
<br>
</li>
<li id='diff-3'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/fa1cc41ad5b69f129d143c9f7a8ddbb532052acc...e9da97da22549863a98c65c7ccb52a77c9dbe4b1#diff-3'>
<strong>
pylib/configure.py
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/pylib/configure.py
</span><span style="color: #000000;background-color: #ddffdd">+++ b/pylib/configure.py
</span><span style="color: #aaaaaa">@@ -158,13 +158,17 @@ def cmd_configure(ctx):
</span> ctx.env.PLATFORM_TARGET = "freebsd"
elif platform.startswith("netbsd"):
ctx.env.PLATFORM_TARGET = "netbsd"
<span style="color: #000000;background-color: #ddffdd">+ elif platform.startswith("openbsd"):
+ ctx.env.PLATFORM_TARGET = "openbsd"
</span> else:
ctx.env.PLATFORM_TARGET = "unix"
ctx.end_msg(ctx.env.PLATFORM_TARGET )
<span style="color: #000000;background-color: #ddffdd">+ ctx.define("PLATFORM_%s" % ctx.env.PLATFORM_TARGET.upper(), 1)
+
</span>
# XXX: hack
<span style="color: #000000;background-color: #ffdddd">- if ctx.env.PLATFORM_TARGET in ["freebsd", "osx"]:
</span><span style="color: #000000;background-color: #ddffdd">+ if ctx.env.PLATFORM_TARGET in ["freebsd", "osx", "openbsd"]:
</span> ctx.env.PLATFORM_INCLUDES = ["/usr/local/include"]
ctx.env.PLATFORM_LIBPATH = ["/usr/local/lib"]
elif ctx.env.PLATFORM_TARGET == "netbsd":
<span style="color: #aaaaaa">@@ -248,7 +252,8 @@ def cmd_configure(ctx):
</span> ctx.check_cc(lib="ossaudio", mandatory=False) # NetBSD audio
ctx.check_cc(lib="pthread", mandatory=False)
ctx.check_cc(lib="rt", mandatory=False)
<span style="color: #000000;background-color: #ffdddd">- ctx.check_cc(lib="readline", mandatory=False)
</span><span style="color: #000000;background-color: #ddffdd">+ ctx.check_cc(lib="curses", mandatory=False) # Required for readline on OpenBSD.
+ ctx.check_cc(lib="readline", use="CURSES", mandatory=False)
</span> ctx.check_cc(lib="thr", mandatory=False)
ctx.check_cc(lib="gcc_s", mandatory=False)
<span style="color: #aaaaaa">@@ -343,7 +348,9 @@ def cmd_configure(ctx):
</span> #HGM "sys/systune.h",
("timepps.h", ["inttypes.h"]),
("sys/timepps.h", ["inttypes.h", "sys/time.h"]),
<span style="color: #000000;background-color: #ffdddd">- "utmpx.h" # missing on RTEMS and OpenBSD
</span><span style="color: #000000;background-color: #ddffdd">+ "utmpx.h", # missing on RTEMS and OpenBSD
+ "sys/timex.h",
+ "sys/audio.h"
</span> )
for hdr in optional_headers:
if type(hdr) == type(""):
<span style="color: #aaaaaa">@@ -376,6 +383,13 @@ def cmd_configure(ctx):
</span> #HGM check_posix_thread_version(ctx)
#HGM ctx.define('HAVE_PTHREADS', ctx.env.POSIX_THREAD_VERISON)
<span style="color: #000000;background-color: #ddffdd">+ # 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
+
+ # Some systems don't have sys/audio.h eg OS X, OpenBSD...
+ if ctx.get_define("HAVE_SYS_AUDIO_H"):
+ ctx.env.HEADER_SYS_AUDIO_H = True
</span>
if ctx.options.refclocks:
from refclock import refclock_config
</code></pre>
<br>
</li>
<li id='diff-4'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/fa1cc41ad5b69f129d143c9f7a8ddbb532052acc...e9da97da22549863a98c65c7ccb52a77c9dbe4b1#diff-4'>
<strong>
util/wscript
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/util/wscript
</span><span style="color: #000000;background-color: #ddffdd">+++ b/util/wscript
</span><span style="color: #aaaaaa">@@ -6,7 +6,7 @@ def build(ctx):
</span>
util = ['bumpclock', 'hist', 'propdelay', 'sht']
<span style="color: #000000;background-color: #ffdddd">- if ctx.env.PLATFORM_TARGET not in ['osx']:
</span><span style="color: #000000;background-color: #ddffdd">+ if ctx.env.HEADER_SYS_AUDIO_H:
</span> util += ['tg2']
for name in util:
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/compare/fa1cc41ad5b69f129d143c9f7a8ddbb532052acc...e9da97da22549863a98c65c7ccb52a77c9dbe4b1">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
</p>
</div>
</body>
</html>