diff --git a/packages/databases/mysql/package.mk b/packages/databases/mysql/package.mk index 438b857974..a8276d5586 100644 --- a/packages/databases/mysql/package.mk +++ b/packages/databases/mysql/package.mk @@ -36,7 +36,7 @@ PKG_LONGDESC="MySQL is a SQL (Structured Query Language) database server. SQL is PKG_IS_ADDON="no" PKG_AUTORECONF="yes" -TARGET_CFLAGS="$TARGET_CFLAGS -fPIC -DPIC" +TARGET_CFLAGS="$TARGET_CFLAGS -fPIC -DPIC -I$SYSROOT_PREFIX/usr/include/ncurses" PKG_CONFIGURE_OPTS_HOST="--with-zlib-dir=$ROOT/$TOOLCHAIN" diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk index 42a39a2649..61351acbe0 100644 --- a/packages/devel/ncurses/package.mk +++ b/packages/devel/ncurses/package.mk @@ -101,8 +101,6 @@ make_target() { make -C panel make -C menu make -C form - - $AR cru lib/libncurses.a obj_s/*.o } makeinstall_target() { @@ -112,20 +110,14 @@ makeinstall_target() { $MAKEINSTALL -C menu $MAKEINSTALL -C form - cp $SYSROOT_PREFIX/usr/include/ncurses/curses.h \ - $SYSROOT_PREFIX/usr/include/ncurses/term.h \ - $SYSROOT_PREFIX/usr/include/ - cp misc/ncurses-config $ROOT/$TOOLCHAIN/bin chmod +x $ROOT/$TOOLCHAIN/bin/ncurses-config $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $ROOT/$TOOLCHAIN/bin/ncurses-config - make DESTDIR=$INSTALL -C include install make DESTDIR=$INSTALL -C ncurses install make DESTDIR=$INSTALL -C panel install make DESTDIR=$INSTALL -C menu install make DESTDIR=$INSTALL -C form install - } post_makeinstall_target() { diff --git a/packages/tools/nano/build b/packages/tools/nano/build index ee623e9098..11b6582404 100755 --- a/packages/tools/nano/build +++ b/packages/tools/nano/build @@ -22,6 +22,7 @@ . config/options $1 +CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses" LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` LDFLAGS="$LDFLAGS -ltinfo"