diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk index 4874062678..83955e1786 100644 --- a/packages/devel/ncurses/package.mk +++ b/packages/devel/ncurses/package.mk @@ -43,7 +43,7 @@ PKG_CONFIGURE_OPTS_TARGET="--without-cxx \ --with-normal \ --without-debug \ --without-profile \ - --with-termlib \ + --without-termlib \ --without-dbmalloc \ --without-dmalloc \ --without-gpm \ @@ -70,6 +70,7 @@ PKG_CONFIGURE_OPTS_TARGET="--without-cxx \ --disable-widec \ --disable-echo \ --disable-warnings \ + --disable-home-terminfo \ --disable-assertions" pre_configure_target() { @@ -102,6 +103,9 @@ makeinstall_target() { $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $ROOT/$TOOLCHAIN/bin/ncurses-config make DESTDIR=$INSTALL -C ncurses install + # provide tinfo to not break 3rdparty stuff. + # TODO remove after addon bump + ln -sf libncurses.so.5 $INSTALL/usr/lib/libtinfo.so.5 } post_makeinstall_target() { diff --git a/packages/tools/dialog/package.mk b/packages/tools/dialog/package.mk index 0211474de9..e525c54afd 100644 --- a/packages/tools/dialog/package.mk +++ b/packages/tools/dialog/package.mk @@ -45,7 +45,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-nls \ --disable-tailbox" pre_configure_target() { - export LDFLAGS="$LDFLAGS -ltinfo" export NCURSES_CONFIG="$ROOT/$TOOLCHAIN/bin/ncurses-config" } diff --git a/packages/tools/nano/package.mk b/packages/tools/nano/package.mk index 8c65b49397..d7916fe54d 100644 --- a/packages/tools/nano/package.mk +++ b/packages/tools/nano/package.mk @@ -35,7 +35,6 @@ PKG_AUTORECONF="yes" export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses" export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` -export LDFLAGS="$LDFLAGS -ltinfo" post_makeinstall_target() { rm -rf $INSTALL/usr/share/nano/man-html