[Git][NTPsec/ntpsec][master] 4 commits: Add a note about libevent on some systems.

[Amar Takhar]

Amar Takhar pushed to branch master at NTPsec / ntpsec


Commits:
ae20d01d by Amar Takhar at 2016-02-11T16:36:18-05:00
Add a note about libevent on some systems.

On NetBSD there is no event_core.  event is pulled in by event_pthread so
event_core is not detected however it builds anyway since the link test runs.

This is by design as a 'fall through' to detect strange setups.  Still not sure
how to handle this case yet for now users will get a harmless warning.

- - - - -
5495e84d by Amar Takhar at 2016-02-11T16:36:18-05:00
Force unit test runner to off on cross compiles.

- - - - -
ca16e603 by Amar Takhar at 2016-02-11T16:36:18-05:00
All arguments and commands should be lists.

- - - - -
4bfbfae2 by Amar Takhar at 2016-02-11T21:25:07-05:00
Remove define for OPENSSL_VERSION_TEXT.

I checked on several different operating systems OpenSSL provides this on its
own it seems.

- - - - -


3 changed files:

- pylib/check_libevent2.py
- pylib/configure.py
- wscript


Changes:

=====================================
pylib/check_libevent2.py
=====================================
--- a/pylib/check_libevent2.py
+++ b/pylib/check_libevent2.py
@@ -18,6 +18,9 @@ int main(void) {
 def check_libevent2_header(ctx):
 	ctx.check(header_name="event2/event.h", includes=ctx.env.PLATFORM_INCLUDES, mandatory = False)
 	ctx.check(header_name="event2/thread.h", includes=ctx.env.PLATFORM_INCLUDES, mandatory = False)
+
+	# XXX: On some systems (NetBSD) event_core doesn't exist.  libevent is pulled in with event_pthreads.
+	#      This results in a warning from check_sanity()
 	ctx.check(feature="c cshlib", lib="event_core", libpath=ctx.env.PLATFORM_LIBPATH, uselib_store="LIBEVENT_CORE", mandatory = False)
 	ctx.check(feature="c cshlib", lib="event_pthreads", libpath=ctx.env.PLATFORM_LIBPATH, uselib_store="LIBEVENT_PTHREADS", use="LIBEVENT_CORE", mandatory = False)
 


=====================================
pylib/configure.py
=====================================
--- a/pylib/configure.py
+++ b/pylib/configure.py
@@ -112,8 +112,8 @@ def cmd_configure(ctx):
 #		ctx.get_cc_version(ctx.env.CC, gcc=True)
 		ctx.end_msg(ctx.options.cross_compiler)
 
-		ctx.env.CC = ctx.options.cross_compiler
-		ctx.env.LINK_CC = ctx.options.cross_compiler
+		ctx.env.CC = [ctx.options.cross_compiler]
+		ctx.env.LINK_CC = [ctx.options.cross_compiler]
 
 		if ctx.env["CROSS-CFLAGS"]:
 			ctx.env.CFLAGS = opt_map["CROSS-CFLAGS"]
@@ -231,7 +231,7 @@ def cmd_configure(ctx):
 	ctx.define("DFLT_RLIMIT_STACK", 50)
 	ctx.define("DFLT_RLIMIT_MEMLOCK", 32)
 
-	ctx.define("OPENSSL_VERSION_TEXT", "#XXX: Fixme")
+#	ctx.define("OPENSSL_VERSION_TEXT", "#XXX: Fixme")
 
 	probe_multicast(ctx, "MCAST", "Checking for multicast capability")
 


=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -277,3 +277,5 @@ def build(ctx):
 		ctx.add_post_fun(waf_unit_test.summary)
 	else:
 		pprint("YELLOW", "Unit test runner skipped on a cross-compiled build.")
+		from waflib import Options
+		Options.options.no_tests = True



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/3686dcf6c0ca36234b9afa733ac5382eb92b39e2...4bfbfae2aed8e4b6545d92d5f8015bdf9addf23c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160212/4b9d4eaa/attachment.html>