[Git][NTPsec/ntpsec][master] Readline on LEDE requires the ncurses library

[Eric S. Raymond]

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


Commits:
2d699b1a by Stephen Walker at 2016-08-20T12:52:00-04:00
Readline on LEDE requires the ncurses library

[184/185] Linking build/main/ntpq/ntpq
libntp/libntp.a(ntp_lineedit.c.1.o): In function `ntp_readline':
ntp_lineedit.c:(.text+0xf0): undefined reference to `readline'
ntp_lineedit.c:(.text+0x10c): undefined reference to `add_history'
collect2: error: ld returned 1 exit status

Waf: Leaving directory `/home/sdwalker/lede/build_dir/target-mips_34kc_musl-1.1.15/NTPsec-0.9.5-20160819/build/main'
Build failed
 -> task in 'ntpq' failed (exit status 1):
        {task 36811360: cprogram ntpq.c.2.o,ntpq-subs.c.2.o,version.c.2.o -> ntpq}
['ccache_cc', 'ntpq/ntpq.c.2.o', 'ntpq/ntpq-subs.c.2.o', 'ntpq/version.c.2.o', '-o', '/home/sdwalker/lede/build_dir/target-mips_34kc_musl-1.1.15/NTPsec-0.9.5-20160819/build/main/ntpq/ntpq', '-Wl,-Bstatic', '-Llibntp', '-Llibsodium', '-Llibisc', '-lntp', '-lsodium', '-lisc', '-Wl,-Bdynamic', '-lm', '-lrt', '-lpthread', '-lcrypto', '-L/home/sdwalker/lede/stag$
Makefile:219: recipe for target '/home/sdwalker/lede/build_dir/target-mips_34kc_musl-1.1.15/NTPsec-0.9.5-20160819/.built' failed
make[2]: *** [/home/sdwalker/lede/build_dir/target-mips_34kc_musl-1.1.15/NTPsec-0.9.5-20160819/.built] Error 1

Signed-off-by: Stephen Walker <stephendwalker+github at gmail.com>

- - - - -


2 changed files:

- ntpq/wscript
- wafhelpers/configure.py


Changes:

=====================================
ntpq/wscript
=====================================
--- a/ntpq/wscript
+++ b/ntpq/wscript
@@ -24,7 +24,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 READLINE",
+		use			= "ntp opts isc M RT READLINE EDIT PTHREAD CRYPTO CURSES NCURSES READLINE",
 		includes	= [
 						"%s/ntpq/" % bldnode
 		],


=====================================
wafhelpers/configure.py
=====================================
--- a/wafhelpers/configure.py
+++ b/wafhelpers/configure.py
@@ -272,7 +272,9 @@ def cmd_configure(ctx, config):
 	ctx.check_cc(lib="m", comment="Math library")
 	ctx.check_cc(lib="rt", mandatory=False, comment="realtime library")
 	ctx.check_cc(lib="curses", mandatory=False, comment="curses library, required for readline on OpenBSD") # Required for readline on OpenBSD.
+	ctx.check_cc(lib="ncurses", mandatory=False, comment="ncurses library, required for readline on LEDE") # Required for readline on LEDE.
 	ctx.check_cc(lib="readline", use="CURSES", mandatory=False, comment="readline library")
+	ctx.check_cc(lib="readline", use="NCURSES", mandatory=False, comment="readline library")
 
 	# Find OpenSSL. Must happen before function checks
 	if ctx.options.enable_crypto:



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/2d699b1ae574b9ee83d29fc1bf8e6e06f1e15b38
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160820/5384a9e5/attachment.html>