Merge branch 'master' into upgrade

2 files changed, 30 insertions, 9 deletions

diff --git a/blfs/Makefile b/blfs/Makefile
index cfa075b..12d9cb7 100644
--- a/blfs/Makefile
+++ b/blfs/Makefile
@@ -44,7 +44,7 @@ fop : apache-ant
 GC : libatomic_ops
 	@echo "GC"
 
-GDB : six Guile Valgrind-llvm
+GDB : Guile six Valgrind-llvm
 	@echo "GDB"
 
 GLib : docbook-xml docbook-xsl GDB GTK-Doc libxslt PCRE #gobject-introspection \
@@ -54,9 +54,12 @@ GLib : docbook-xml docbook-xsl GDB GTK-Doc libxslt PCRE #gobject-introspection \
 gobject-introspection : GLib GTK-Doc Mako
 	@echo "gobject-introspection"
 
-GTK-Doc : docbook-xml docbook-xsl itstool libxslt Pygments
+GTK-Doc : docbook-xml docbook-xsl itstool libxslt lxml Pygments
 	@echo "GTK-Doc"
 
+GTK-Doc-fop : GTK-Doc fop
+	@echo "GTK-Doc-fop"
+
 Guile : GC libunistring #Runtime GDB Emacs
 	@echo "Guile"
 
@@ -78,6 +81,15 @@ libarchive : libxml2 LZO Nettle
 libatomic_ops :
 	@echo "libatomic_ops"
 
+libcap-pam : Linux-PAM
+	@echo "libcap-pam"
+
+libedit :
+	@echo "libedit"
+
+libevent :
+	@echo "libevent"
+
 libgcrypt : libgpg-error
 	@echo "libgcrypt"
 
@@ -117,6 +129,9 @@ libyaml :
 Linux-PAM : Berkeley_DB docbook-xml docbook-xsl fop libnsl libtirpc libxslt Lynx
 	@echo "Linux-PAM"
 
+lxml : libxslt
+	@echo "lxml"
+
 LLVM : CMake libxml2 Pygments PyYAML Valgrind Zip
 	@echo "LLVM"
 
@@ -135,7 +150,7 @@ Mako : MarkupSafe
 MarkupSafe :
 	@echo "MarkupSafe"
 
-MIT_Kerberos : OpenLDAP yasm
+MIT_Kerberos : libedit OpenLDAP yasm
 	@echo "MIT_Kerberos"
 
 Net-SSLeay :
@@ -156,7 +171,8 @@ nss : nspr sqlite3
 nspr :
 	@echo "nspr"
 
-ntp : IO-Socket-SSL
+# optional with a systemd install
+ntp : IO-Socket-SSL libcap-pam libedit libevent
 	@echo "ntp"
 
 OpenLDAP : Berkeley_DB Cyrus-SASL
@@ -165,15 +181,18 @@ OpenLDAP : Berkeley_DB Cyrus-SASL
 OpenLDAP-Extras : GnuTLS MariaDB PostgreSQL Pth unixODBC
 	@echo "OpenLDAP-Extras"
 
-OpenSSH :
+OpenSSH : libedit
 	@echo "OpenSSH"
 
 p11-kit : libtasn1 libxslt nss
 	@echo "p11-kit"
 
-PCRE :
+PCRE : libedit Valgrind
 	@echo "PCRE"
 
+PCRE2 :
+	@echo "PCRE2"
+
 Pygments :
 	@echo "Pygments"
 
@@ -195,7 +214,7 @@ Sharutils :
 six :
 	@echo "six"
 
-sqlite3 : unzip
+sqlite3 : libedit unzip
 	@echo "sqlite3"
 
 sudo : Linux-PAM MIT_Kerberos OpenLDAP
diff --git a/chapter8/ncurses.sh b/chapter8/ncurses.sh
index c7ba368..2b82d69 100644
--- a/chapter8/ncurses.sh
+++ b/chapter8/ncurses.sh
@@ -7,14 +7,16 @@ set -e
             --without-debug \
             --without-normal \
             --enable-pc-files \
-            --enable-widec &&
+            --enable-widec \
+			--with-termlib \
+			--disable-tic-depends &&
 
 make &&
 make -j1 install &&
 
 mv -v /usr/lib/libncursesw.so.6* /lib &&
 ln -sfv ../../lib/"$(readlink /usr/lib/libncursesw.so)" /usr/lib/libncursesw.so &&
-for lib in ncurses form panel menu ; do
+for lib in ncurses form panel menu tinfo ; do
     rm -vf                    /usr/lib/lib"${lib}".so &&
     echo "INPUT(-l${lib}w)" > /usr/lib/lib"${lib}".so &&
     ln -sfv "${lib}"w.pc        /usr/lib/pkgconfig/"${lib}".pc