[Git][NTPsec/ntpsec][master] 2 commits: The libopts libray is long dead. Decomplicate the build recipe.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
5b636939 by Eric S. Raymond at 2016-10-21T07:22:20-04:00
The libopts libray is long dead.  Decomplicate the build recipe.

- - - - -
d3934c53 by Eric S. Raymond at 2016-10-21T07:45:36-04:00
Remove unecessary things from link lines.

- - - - -


7 changed files:

- ntpd/wscript
- ntpdig/wscript
- ntpfrob/wscript
- ntpkeygen/wscript
- ntpq/wscript
- ntptime/wscript
- util/wscript


Changes:

=====================================
ntpd/wscript
=====================================
--- a/ntpd/wscript
+++ b/ntpd/wscript
@@ -130,11 +130,10 @@ def build(ctx):
 		target		= "ntpd",
 		features	= "c rtems_trace cprogram bld_include src_include libisc_include libisc_pthread_include ntp_version",
 		source		= ntpd_source,
-		use			= "libntpd_obj isc ntp sodium opts M parse RT CAP SECCOMP THR PTHREAD CRYPTO DNS_SD DNS_SD_INCLUDES %s" % use_refclock,
-#		use			= "libntpd_obj bison_obj isc ntp sodium opts M parse RT CAP THR 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" % use_refclock,
 		includes	= [
-						"%s/host/ntpd/" % ctx.bldnode.parent.abspath(),
-						"%s/ntpd/" % srcnode,
+					"%s/host/ntpd/" % ctx.bldnode.parent.abspath(),
+					"%s/ntpd/" % srcnode,
                         "%s/libsodium/include" % srcnode
 		],
 		install_path	= ntpd_install_path,


=====================================
ntpdig/wscript
=====================================
--- a/ntpdig/wscript
+++ b/ntpdig/wscript
@@ -13,7 +13,7 @@ def build(ctx):
 	ctx(
 		target		= "ntpdig_obj",
 		features	= "c bld_include src_include libisc_include",
-		use		= "ntp isc opts M PTHREAD LIBEVENT_CORE LIBEVENT_PTHREADS RT CRYPTO",
+		use		= "ntp isc M PTHREAD LIBEVENT_CORE LIBEVENT_PTHREADS RT CRYPTO",
 		source		= ntpdig_obj_source,
 		cwd             = bldnode,
 		includes	= [
@@ -28,7 +28,7 @@ def build(ctx):
 	ctx(
 		target		= "ntpdig",
 		features	= "c cprogram bld_include src_include libisc_include ntp_version",
-		use		= "ntp isc opts ntpdig_obj M PTHREAD ntpdig_obj LIBEVENT_CORE LIBEVENT_PTHREADS RT CRYPTO",
+		use		= "ntp isc ntpdig_obj M PTHREAD ntpdig_obj LIBEVENT_CORE LIBEVENT_PTHREADS RT CRYPTO",
 		source		= ntpdig_source,
 		cwd             = bldnode,
 		includes	= [


=====================================
ntpfrob/wscript
=====================================
--- a/ntpfrob/wscript
+++ b/ntpfrob/wscript
@@ -14,7 +14,6 @@ def build(ctx):
 		includes	= [
 					"%s/ntpfrob/" % bldnode
 				],
-		use		= "ntp opts isc M RT PTHREAD",
 		install_path = "${PREFIX}/bin/"
 	)
 


=====================================
ntpkeygen/wscript
=====================================
--- a/ntpkeygen/wscript
+++ b/ntpkeygen/wscript
@@ -17,7 +17,7 @@ def build(ctx):
 			"%s/libsodium/include/" % srcnode
 		],
 		# clock_gettime needs -lrt for glibc versions before 2.17
-		use		= "ntp opts isc sodium M RT PTHREAD CRYPTO",
+		use		= "ntp isc sodium M CRYPTO",
 		install_path= "${PREFIX}/bin/"
 	)
 


=====================================
ntpq/wscript
=====================================
--- a/ntpq/wscript
+++ b/ntpq/wscript
@@ -11,7 +11,7 @@ def build(ctx):
 		target		= "ntpq",
 		features	= "c cprogram bld_include src_include libisc_include ntp_version",
 		source		= ntpq_source,
-		use		= "ntp opts isc M RT READLINE EDIT PTHREAD CRYPTO CURSES NCURSES READLINE",
+		use		= "ntp isc M RT READLINE EDIT PTHREAD CRYPTO CURSES NCURSES READLINE",
 		includes	= [bldnode],
 		install_path    = "${PREFIX}/bin/",
 	)


=====================================
ntptime/wscript
=====================================
--- a/ntptime/wscript
+++ b/ntptime/wscript
@@ -13,7 +13,7 @@ def build(ctx):
 						"%s/ntptime/" % bldnode,
 						"%s/ntptime/" % srcnode,
 					  ],
-			use		= "ntp opts isc M RT PTHREAD",
+			use		= "ntp isc M",
 			install_path = "${PREFIX}/bin/"
 		)
 


=====================================
util/wscript
=====================================
--- a/util/wscript
+++ b/util/wscript
@@ -13,6 +13,6 @@ def build(ctx):
 			includes	= [
 						"%s/%s/" % (bldnode, name)
 					],
-			use		= "ntp opts isc M RT THR PTHREAD",
+			use		= "ntp isc M RT THR PTHREAD",
 			install_path    = None,
 		)



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/f13333104f06610a1e6eeb2e332e5a565e7d3c18...d3934c53cf993d6ef1c485977952165906bd0338
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20161021/73034f87/attachment.html>