changeset 647:c8928a51240b

lib/ncurses: rebuild as recommended per LFS
author David Demelier <markand@malikania.fr>
date Sat, 27 Jul 2019 14:05:54 +0200
parents 5131a8ac0815
children e7bebea8c0eb
files lib/ncurses/ncurses.sh
diffstat 1 files changed, 18 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/lib/ncurses/ncurses.sh	Sat Jul 27 14:05:22 2019 +0200
+++ b/lib/ncurses/ncurses.sh	Sat Jul 27 14:05:54 2019 +0200
@@ -26,8 +26,6 @@
 : ${CBUILD:=$(uname -m)-linux-musl}
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
-: ${CXX:=clang++}
-: ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
 
@@ -37,36 +35,43 @@
 	tar xvf $PKGNAME-$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
+	# --enable-overwrite: required when prefix is not /usr.
+	# --enable-pc-files: lots of packages require this.
+	# --enable-widec: some packages require this it (e.g. neomutt).
+	# --with-manpage-format=normal: vpk compress by itself.
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
-	CXX="$CXX" \
-	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--enable-overwrite \
 		--enable-pc-files \
+		--enable-widec \
 		--prefix= \
-		--with-cxx-shared \
 		--with-manpage-format=normal \
-		--with-normal \
 		--with-pkg-config-libdir=/lib/pkgconfig \
 		--with-shared \
-		--without-ada \
 		--without-debug
 	make
 	make install DESTDIR=$DESTDIR
 
-	for lib in libmenu libncurses libncurses++ libpanel libform; do
+	# Remove static libraries.
+	for lib in libmenuw libncursesw libpanelw libformw; do
 		rm -f $DESTDIR/lib/$lib.a
 	done
 
-	# Add required curses symlinks.
-	ln -sf libncurses.so $DESTDIR/lib/libcurses.so
-	for i in $DESTDIR/include/ncurses/*.h; do
-		ln -sf /include/ncurses/$(basename $i) \
-			$DESTDIR/include/$(basename $i)
+	# For each wide library, create a input link.
+	for lib in ncurses ncurses++ form panel menu; do
+		echo "INPUT(-l${lib}w)" > $DESTDIR/lib/lib${lib}.so
+		ln -s ${lib}w.pc $DESTDIR/lib/pkgconfig/${lib}.pc
 	done
 
+	# Create a legacy libcurses library.
+	echo "INPUT(-lncursesw)" > $DESTDIR/lib/libcursesw.so
+	ln -s libncurses.so $DESTDIR/lib/libcurses.so
+
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }