Fix compilation on platforms that split the ncurses and tinfo libraries

Some platforms compile ncurses in such a way that the tinfo library needs to
be separately linked in (e.g. Gentoo).

The tinfo library is a low-level library being used by and bundled with
ncurses.

Adding '-ltinfo' to WINTTYLIB in the hint files was considered the most robust
solution to this problem.  This still works on systems with ncurses 5.9.
Using pkg-config was ruled out as the default build of ncurses doesn't install
the necessary files.

diff --git a/doc/fixes36.4 b/doc/fixes36.4
index 8d466e0964b223df5002c474c4783054bb88f863..693eebc5c9c8087a5d1f44b7842d4fcad6339468 100644 (file)
--- a/doc/fixes36.4
+++ b/doc/fixes36.4
@@ -23,6 +23,7 @@ Fixes to Post-3.6.3 Problems that Were Exposed Via git Repository
 
 Platform- and/or Interface-Specific Fixes or Features
 -----------------------------------------------------
+fix compilation on platforms that split the ncurses and tinfo libraries
 
 
 General New Features

diff --git a/sys/unix/hints/linux b/sys/unix/hints/linux
index dcdee332dd5a792541fe0ea00a891dd1f8e227fa..862915053cd0b880c068d56929a57b0dfdb5b0a3 100644 (file)
--- a/sys/unix/hints/linux
+++ b/sys/unix/hints/linux
@@ -47,7 +47,7 @@ WINLIB = $(WINTTYLIB) $(WINCURSESLIB)
 #WINSRC += tile.c
 #WINOBJ += tile.o
 
-WINTTYLIB=-lcurses
+WINTTYLIB=-lncurses -ltinfo
 
 CHOWN=true
 CHGRP=true

diff --git a/sys/unix/hints/linux-chroot b/sys/unix/hints/linux-chroot
index eb4fc2733258ea05f413915bed137bd56593c8c4..e5bb767fbcb8559b095a80cd14e8fa40ace2d110 100644 (file)
--- a/sys/unix/hints/linux-chroot
+++ b/sys/unix/hints/linux-chroot
@@ -39,7 +39,7 @@ WINSRC = $(WINTTYSRC)
 WINOBJ = $(WINTTYOBJ)
 WINLIB = $(WINTTYLIB)
 
-WINTTYLIB=-lcurses
+WINTTYLIB=-lncurses -ltinfo
 
 CHOWN=true
 CHGRP=true

diff --git a/sys/unix/hints/linux-minimal b/sys/unix/hints/linux-minimal
index 6c2638ae33fe8d9b3b70bb7ad6ee62f2fca4fc9f..256332cc72aefd01cf6709bea3bfea8c1d9a482d 100644 (file)
--- a/sys/unix/hints/linux-minimal
+++ b/sys/unix/hints/linux-minimal
@@ -21,7 +21,7 @@ WINSRC = $(WINTTYSRC)
 WINOBJ = $(WINTTYOBJ)
 WINLIB = $(WINTTYLIB)
 
-WINTTYLIB=-lcurses
+WINTTYLIB=-lncurses -ltinfo
 
 CHOWN=true
 CHGRP=true