[Git][NTPsec/ntpsec][master] Adding audio to NetBSD: needs libossaudio

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
42b515d4 by Hal Murray at 2015-12-04T21:57:23Z
Adding audio to NetBSD: needs libossaudio

- - - - -


3 changed files:

- ntpd/wscript
- pylib/configure.py
- util/wscript


Changes:

=====================================
ntpd/wscript
=====================================
--- a/ntpd/wscript
+++ b/ntpd/wscript
@@ -135,7 +135,7 @@ def build(ctx):
 		target		= "ntpd",
 		features	= "c cprogram bld_include src_include libisc_include libisc_pthread_include ntp_version",
 		source		= ntpd_source,
-		use			= "libntpd_obj bison_obj isc ntp sodium opts M parse GCC_S RT CAP THR PTHREAD CRYPTO DNS_SD DNS_SD_INCLUDES %s" % use_refclock,
+		use			= "libntpd_obj bison_obj isc ntp sodium opts OSSAUDIO M parse GCC_S RT CAP THR PTHREAD CRYPTO DNS_SD DNS_SD_INCLUDES %s" % use_refclock,
 		includes	= [
 			"%s/ntpd/" % bldnode,
 			"%s/ntpd/" % srcnode,


=====================================
pylib/configure.py
=====================================
--- a/pylib/configure.py
+++ b/pylib/configure.py
@@ -62,7 +62,7 @@ def cmd_configure(ctx):
 		ctx.env.PLATFORM_INCLUDES = ["/usr/local/include"]
 		ctx.env.PLATFORM_LIBPATH = ["/usr/local/lib"]
 	elif ctx.env.PLATFORM_TARGET == "netbsd":
-		ctx.env.PLATFORM_LIBPATH = ["/usr/pkg/lib"]
+		ctx.env.PLATFORM_LIBPATH = ["/usr/lib"]
 	elif ctx.env.PLATFORM_TARGET == "win":
 		ctx.load("msvc")
 
@@ -190,6 +190,7 @@ def cmd_configure(ctx):
 
 	ctx.check_cc(lib="edit", mandatory=False)
 	ctx.check_cc(lib="m")
+	ctx.check_cc(lib="ossaudio", mandatory=False)  # NetBSD audio
 	ctx.check_cc(lib="pthread")
 	ctx.check_cc(lib="rt", mandatory=False)
 	ctx.check_cc(lib="readline", mandatory=False)


=====================================
util/wscript
=====================================
--- a/util/wscript
+++ b/util/wscript
@@ -6,7 +6,7 @@ def build(ctx):
 
 	util = ['bumpclock', 'hist', 'propdelay', 'sht']
 
-	if ctx.env.PLATFORM_TARGET not in ['netbsd', 'osx']:
+	if ctx.env.PLATFORM_TARGET not in ['osx']:
 		util += ['tg2']
 
 	for name in util:
@@ -17,7 +17,7 @@ def build(ctx):
 			includes	= [
 						"%s/%s/" % (bldnode, name)
 					],
-			use		= "ntp opts isc M RT PTHREAD",
+			use		= "ntp opts isc OSSAUDIO M RT PTHREAD",
 			install_path    = False
 		)
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/42b515d42b684cfbb2b266aceae1ab201709b6dd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20151205/87721084/attachment.html>