build: Install libinfo/libtic and progs from widec trees

Also list OPK_PACKAGES explicitly and run oh-fixperms and oh-strip on
all dest dirs (fixes "find: dest: No such file or directory" errors).

2 files changed, 42 insertions, 26 deletions

diff --git a/build b/build
index beacb0a..fef1f15 100755
--- a/build
+++ b/build
@@ -11,7 +11,6 @@ common_opts = \
 	--without-tests \
 	--with-pkg-config-libdir='/usr/lib/$(OPK_HOST_ARCH)/pkgconfig' \
 	--enable-pc-files \
-	--with-install-prefix="$${PWD}/dest" \
 	--with-shared \
 	--with-cxx-shared \
 	--without-debug \
@@ -50,40 +49,55 @@ build: build_ncurses build_ncursesw build_ncurses_legacy build_ncursesw_legacy
 install: build
 	(cd obj_ncurses_legacy && make install.libs)
 	(cd obj_ncursesw_legacy && make install.libs)
-	(cd obj_ncurses && make install)
-	(cd obj_ncursesw && make install.libs)
+	(cd obj_ncurses && make install.libs)
+	(cd obj_ncursesw && make install)
 	rm dest*/usr/lib/$(OPK_HOST_ARCH)/*.a
-	mv dest-ncurses/usr/bin/clear dest-ncurses/usr/bin/clear.ncurses
-	mv dest-ncurses/usr/bin/reset dest-ncurses/usr/bin/reset.ncurses
+	mv dest-ncursesw/usr/bin/clear dest-ncursesw/usr/bin/clear.ncurses
+	mv dest-ncursesw/usr/bin/reset dest-ncursesw/usr/bin/reset.ncurses
 	rm dest*/usr/bin/ncurses*-config
-	rm dest-ncurses/usr/share/man/man1/ncurses*-config.1
+	rm dest-ncursesw/usr/share/man/man1/ncurses*-config.1
+	rm dest-ncurses/usr/lib/$(OPK_HOST_ARCH)/libtinfo.*
+	rm dest-ncurses/usr/lib/$(OPK_HOST_ARCH)/libtic.*
+	rm dest-ncurses-legacy/usr/lib/$(OPK_HOST_ARCH)/libtinfo.*
+	rm dest-ncurses-legacy/usr/lib/$(OPK_HOST_ARCH)/libtic.*
 	@# Extract a few individual terminal type definitions.  This would be
 	@# hard to do with oh-installfiles.
 	@# terminfo-linux
 	mkdir -p terminfo-linux.data/usr/lib/
 	ln -sf ../share/terminfo terminfo-linux.data/usr/lib/terminfo
 	mkdir -p terminfo-linux.data/usr/share/terminfo/l/
-	mv dest-ncurses/usr/share/terminfo/l/linux \
+	mv dest-ncursesw/usr/share/terminfo/l/linux \
 		terminfo-linux.data/usr/share/terminfo/l/linux
-	oh-fixperms
-	oh-strip -k
-	OPK_PACKAGES="\
-		$$(printf '%s\n' $${OPK_PACKAGES} | \
-			grep -Ev "lib.*w[.]$(abi_ver)(-dev)?") | \
-			grep -Ev "lib.*[.]$(legacy_abi_ver)(-dev)?") \
-		" oh-installfiles -d dest-ncurses
-	OPK_PACKAGES="\
-		$$(printf '%s\n' $${OPK_PACKAGES} | \
-			grep -E "lib.*w[.]$(abi_ver)(-dev)?") \
-		" oh-installfiles -d dest-ncursesw
-	OPK_PACKAGES="\
-		$$(printf '%s\n' $${OPK_PACKAGES} | \
-			grep -E "lib.*[.]$(legacy_abi_ver)(-dev)?") \
-		" oh-installfiles -d dest-ncurses-legacy
-	OPK_PACKAGES="\
-		$$(printf '%s\n' $${OPK_PACKAGES} | \
-			grep -E "lib.*w[.]$(legacy_abi_ver)(-dev)?") \
-		" oh-installfiles -d dest-ncursesw-legacy
+	set -e; for d in dest*; do \
+		oh-fixperms -d "$${d}"; \
+		oh-strip -k -d "$${d}"; \
+	done
+	OPK_PACKAGES='\
+		libncurses.$(abi_ver) \
+		libncurses++.$(abi_ver) \
+		libncurses.$(abi_ver)-dev \
+		ncurses-dbg \
+		' oh-installfiles -d dest-ncurses
+	OPK_PACKAGES='\
+		libncursesw.$(abi_ver) \
+		libncurses++w.$(abi_ver) \
+		libtinfo.$(abi_ver) \
+		libncurses.$(abi_ver)-dev \
+		ncurses-dbg \
+		' oh-installfiles -d dest-ncursesw
+	OPK_PACKAGES='\
+		libncurses.$(legacy_abi_ver) \
+		libncurses++.$(legacy_abi_ver) \
+		libncurses.$(legacy_abi_ver)-dev \
+		ncurses-dbg \
+		' oh-installfiles -d dest-ncurses-legacy
+	OPK_PACKAGES='\
+		libncursesw.$(legacy_abi_ver) \
+		libncurses++w.$(legacy_abi_ver) \
+		libtinfo.$(legacy_abi_ver) \
+		libncurses.$(legacy_abi_ver)-dev \
+		ncurses-dbg \
+		' oh-installfiles -d dest-ncursesw-legacy
 	oh-shlibdeps
 	# Remove self-dependencies.
 	set -e; for f in *.substvars; do p="$${f%.substvars}"; \
diff --git a/changelog b/changelog
index 0760348..1edc7ce 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ ncurses (6.1+20190630-2) trunk
 
   * ncurses-dbg: Actually include debugging symbols (normally always excluded
     from the shared libraries by upstream).
+  * libtinfo.5, libtinfo.6: Switch to providing wide-character builds of
+    libraries.
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Sat, 06 Jul 2019 16:24:35 -0400