From 90850933387ac16030053561250d85f9a6d29e51 Mon Sep 17 00:00:00 2001
From: Patric Mueller <bhaak@gmx.net>
Date: Sun, 15 Dec 2019 20:38:44 +0100
Subject: [PATCH] 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.
---
 doc/fixes36.4                | 1 +
 sys/unix/hints/linux         | 2 +-
 sys/unix/hints/linux-chroot  | 2 +-
 sys/unix/hints/linux-minimal | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/fixes36.4 b/doc/fixes36.4
index 8d466e096..693eebc5c 100644
--- 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 dcdee332d..862915053 100644
--- 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 eb4fc2733..e5bb767fb 100644
--- 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 6c2638ae3..256332cc7 100644
--- 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