ncurses: disable -ltinfo. disable ~/.terminfo

This commit is contained in:
Stefan Saraev 2014-01-05 22:03:08 +02:00
parent 670b3bee5f
commit 9a838d7c38
3 changed files with 5 additions and 3 deletions

View File

@ -43,7 +43,7 @@ PKG_CONFIGURE_OPTS_TARGET="--without-cxx \
--with-normal \ --with-normal \
--without-debug \ --without-debug \
--without-profile \ --without-profile \
--with-termlib \ --without-termlib \
--without-dbmalloc \ --without-dbmalloc \
--without-dmalloc \ --without-dmalloc \
--without-gpm \ --without-gpm \
@ -70,6 +70,7 @@ PKG_CONFIGURE_OPTS_TARGET="--without-cxx \
--disable-widec \ --disable-widec \
--disable-echo \ --disable-echo \
--disable-warnings \ --disable-warnings \
--disable-home-terminfo \
--disable-assertions" --disable-assertions"
pre_configure_target() { pre_configure_target() {
@ -102,6 +103,9 @@ makeinstall_target() {
$SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $ROOT/$TOOLCHAIN/bin/ncurses-config $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $ROOT/$TOOLCHAIN/bin/ncurses-config
make DESTDIR=$INSTALL -C ncurses install 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() { post_makeinstall_target() {

View File

@ -45,7 +45,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
--disable-tailbox" --disable-tailbox"
pre_configure_target() { pre_configure_target() {
export LDFLAGS="$LDFLAGS -ltinfo"
export NCURSES_CONFIG="$ROOT/$TOOLCHAIN/bin/ncurses-config" export NCURSES_CONFIG="$ROOT/$TOOLCHAIN/bin/ncurses-config"
} }

View File

@ -35,7 +35,6 @@ PKG_AUTORECONF="yes"
export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses" export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses"
export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
export LDFLAGS="$LDFLAGS -ltinfo"
post_makeinstall_target() { post_makeinstall_target() {
rm -rf $INSTALL/usr/share/nano/man-html rm -rf $INSTALL/usr/share/nano/man-html