[Git][NTPsec/ntpsec][master] Solaris's BSD socket functions need to be linked with -lsocket and -lnsl

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
f42e35fc by Matt Selsky at 2017-01-15T20:29:02-05:00
Solaris's BSD socket functions need to be linked with -lsocket and -lnsl

Partially fixes GitLab issue #207 and #209

- - - - -


3 changed files:

- ntpd/wscript
- tests/wscript
- wafhelpers/configure.py


Changes:

=====================================
ntpd/wscript
=====================================
--- a/ntpd/wscript
+++ b/ntpd/wscript
@@ -132,7 +132,7 @@ def build(ctx):
 		target		= "ntpd",
 		features	= "c rtems_trace cprogram bld_include src_include libisc_include libisc_pthread_include",
 		source		= ntpd_source,
-		use		= "libntpd_obj isc ntp sodium M parse RT CAP SECCOMP PTHREAD CRYPTO DNS_SD DNS_SD_INCLUDES %s" % use_refclock,
+		use		= "libntpd_obj isc ntp sodium M parse RT CAP SECCOMP PTHREAD CRYPTO DNS_SD DNS_SD_INCLUDES %s SOCKET NSL" % use_refclock,
 		includes	= [
 					"%s/host/ntpd/" % ctx.bldnode.parent.abspath(),
 					"%s/ntpd/" % srcnode,


=====================================
tests/wscript
=====================================
--- a/tests/wscript
+++ b/tests/wscript
@@ -62,7 +62,7 @@ def build(ctx):
 					"%s/tests/ntpdig/" % srcnode,
 					"%s/tests/common/" % srcnode
 				],
-		use		= "unity ntp isc M PTHREAD CRYPTO RT",
+		use		= "unity ntp isc M PTHREAD CRYPTO RT SOCKET NSL",
 		source		= libntp_source,
 	)
 
@@ -82,6 +82,6 @@ def build(ctx):
 					"%s/tests/libntp/" % srcnode,
 					"%s/tests/common/" % srcnode
 				],
-		use		= "ntpd_lib libntpd_obj unity ntp isc M PTHREAD CRYPTO RT",
+		use		= "ntpd_lib libntpd_obj unity ntp isc M PTHREAD CRYPTO RT SOCKET NSL",
         	source		= ntpd_source,
 	)


=====================================
wafhelpers/configure.py
=====================================
--- a/wafhelpers/configure.py
+++ b/wafhelpers/configure.py
@@ -563,6 +563,10 @@ def cmd_configure(ctx, config):
         from wafhelpers.check_mdns import check_mdns_run
         check_mdns_run(ctx)
 
+    # Solaris needs -lsocket and -lnsl for socket code
+    ctx.check(features="c cshlib", lib="socket", mandatory=False)
+    ctx.check(features="c cshlib", lib="nsl", mandatory=False)
+
     if ctx.options.enable_classic_mode:
         ctx.define("ENABLE_CLASSIC_MODE", 1)
     else:



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/f42e35fc33274556982e5ee526d4d8fd56c412d9
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170116/bc01db4e/attachment.html>