ncurses: disable separate libtinfow library, remove unneeded TARGET_LDFLAGS

package/alsa-utils/Makefile

@@ -30,7 +30,6 @@ TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
 CONFIGURE_ARGS+=	--disable-xmlto
 ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y)
 CONFIGURE_ARGS+=	--enable-alsamixer --with-curses=ncursesw
-TARGET_LDFLAGS+=	-ltinfow
 else
 CONFIGURE_ARGS+=	--disable-alsamixer
 endif

package/gptfdisk/Makefile

@@ -24,7 +24,6 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,GPTFDISK,gptfdisk,$(PKG_VERSION)-$(PKG_RELEASE)))
 $(eval $(call PKG_template,GPTFDISK,gptfdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
-TARGET_LDFLAGS+=	-ltinfow
 HOST_STYLE:=		manual
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual

package/htop/Makefile

@@ -18,7 +18,6 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,HTOP,htop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-ltinfow
 CONFIGURE_ENV+= 	ac_cv_file__proc_stat=yes \
 		  	ac_cv_file__proc_meminfo=yes
 

package/irssi/Makefile

@@ -18,7 +18,7 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-latomic -ltinfow
+TARGET_LDFLAGS+=	-latomic
 CONFIGURE_ARGS+=	--with-perl=no \
 			--with-textui \
 			--without-bot \

package/iwd/Makefile

@@ -23,7 +23,6 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,IWD,iwd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
-TARGET_LDFLAGS+=	-lncursesw -ltinfow
 CONFIGURE_ARGS+=	--disable-manual-pages \
 		  	--disable-monitor \
 		  	--disable-systemd-service \

package/lame/Makefile

@@ -27,8 +27,6 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBMP3LAME,libmp3lame,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBMP3LAME},${PKGSC_LIBMP3LAME},${PKG_OPTS}))
 
-TARGET_LDFLAGS+=	-ltinfow
-
 lame-install:
 	$(INSTALL_DIR) $(IDIR_LAME)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/lame $(IDIR_LAME)/usr/bin

package/mutt/Makefile

@@ -26,7 +26,6 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MUTT,mutt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-ltinfow
 CONFIGURE_ARGS+=	--with-homespool="~/Maildir" \
 			--with-curses="$(STAGING_TARGET_DIR)/usr" \
 			--enable-pop \

package/nano/Makefile

@@ -31,7 +31,6 @@ CONFIGURE_ARGS+=	--enable-nanorc \
 			--disable-speller \
 			--disable-operatingdir \
 			--enable-multibuffer
-TARGET_LDFLAGS+=	-ltinfow
 
 nano-install:
 	${INSTALL_DIR} ${IDIR_NANO}/usr/bin

package/ncurses/Makefile

@@ -41,6 +41,7 @@ CONFIGURE_ENV+=		ac_cv_linux_vers=2
 CONFIGURE_ARGS+=	--without-cxx \
 			--without-cxx-binding \
 			--with-build-cc="${HOST_CC}" \
+			--enable-pc-files \
 			--with-pkg-config-libdir=/usr/lib/pkgconfig \
 			--without-progs \
 			--enable-pc-files \
@@ -48,8 +49,7 @@ CONFIGURE_ARGS+=	--without-cxx \
 			--disable-termcap \
 			--without-ada \
 			--without-normal \
-			--enable-pc-files \
-			--with-termlib \
+			--without-termlib \
 			--without-debug \
 			--without-profile \
 			--without-gpm \
@@ -93,7 +93,7 @@ libncurses-install:
 	echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so
 	# libcurses will not show up in the IPKG, only in STAGING_TARGET_DIR
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/lib
-	${CP} ${WRKINST}/usr/lib/lib{tinfo,form,menu,ncurses,panel}w.so* \
+	${CP} ${WRKINST}/usr/lib/lib{form,menu,ncurses,panel}w.so* \
 	    ${IDIR_LIBNCURSES}/usr/lib
 ifeq (${ADK_PACKAGE_LIBNCURSES_FULL_TERMINFO},y)
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share

package/nftables/Makefile

@@ -19,7 +19,6 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,NFTABLES,nftables,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
-TARGET_LDFLAGS+=	-ltinfow
 CONFIGURE_ARGS+=	--with-cli=readline
 
 nftables-install:

package/tmsnc/Makefile

@@ -20,8 +20,6 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TMSNC,tmsnc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-ltinfow
-
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${STAGING_TARGET_DIR}/usr \
 			--with-openssl=${STAGING_TARGET_DIR}/usr \
 			--with-ncurses=${STAGING_TARGET_DIR}

package/vim/Makefile

@@ -28,7 +28,6 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VIM,vim,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-ltinfow
 CONFIGURE_ENV+=		vim_cv_toupper_broken=no \
 			vim_cv_getcwd_broken=no \
 			vim_cv_stat_ignores_slash=yes \

package/xterm/Makefile

@@ -21,7 +21,6 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XTERM,xterm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-ltinfow
 CONFIGURE_ARGS+=	--with-app-defaults=/usr/lib/X11/app-defaults \
 			--x-includes="$(STAGING_TARGET_DIR)/usr/include" \
 			--x-libraries="$(STAGING_TARGET_DIR)/usr/lib" \