# HG changeset patch # User Aleksej Bobylev # Date 1482551118 -7200 # Node ID e9bd4eca24b2c4906f557f9eb63f44aad0e75f66 # Parent 35e3c24d2100cbb6bedcc07ef4b0b9a68368f8e3 All about ncurses. Carefully follow LFS receipts. libtinfo.so included into libncursesw.so and no more need (so far). diff -r 35e3c24d2100 -r e9bd4eca24b2 bash/receipt --- a/bash/receipt Fri Dec 23 16:18:28 2016 +0100 +++ b/bash/receipt Sat Dec 24 05:45:18 2016 +0200 @@ -18,8 +18,8 @@ BASHPATCHES="$(for i in $(seq 1 ${VERSION##*.}); do printf "bash${BASEVERSION/./}-%03d " $i; done)" EXTRA_SOURCE_FILES="$BASHCHECK $BASHPATCHES" -DEPENDS="readline libtinfo" -BUILD_DEPENDS="readline-dev texinfo gettext patch" +DEPENDS="ncurses readline" +BUILD_DEPENDS="ncurses-dev readline-dev texinfo gettext patch" patch_bash() { diff -r 35e3c24d2100 -r e9bd4eca24b2 libtinfo/receipt --- a/libtinfo/receipt Fri Dec 23 16:18:28 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="libtinfo" -VERSION="5.9" -CATEGORY="development" -SHORT_DESC="Low-level terminfo library." -MAINTAINER="pascal.bellard@slitaz.org" -LICENSE="MIT" -WANTED="ncurses" -WEB_SITE="http://invisible-island.net/ncurses/" -HOST_ARCH="i486 arm" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/lib - cp -a $install/lib/libtinfo*.so* $fs/lib -} diff -r 35e3c24d2100 -r e9bd4eca24b2 linux-api-headers/receipt --- a/linux-api-headers/receipt Fri Dec 23 16:18:28 2016 +0100 +++ b/linux-api-headers/receipt Sat Dec 24 05:45:18 2016 +0200 @@ -14,7 +14,7 @@ WGET_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$TARBALL" PROVIDE="linux-headers linux64-api-headers linux64-headers" -BUILD_DEPENDS="bash libtinfo perl" +BUILD_DEPENDS="bash perl" if [ "$KBASEVER" != "$VERSION" ]; then PATCH="$(dirname $WGET_URL)/patch-$VERSION.xz" diff -r 35e3c24d2100 -r e9bd4eca24b2 ncurses-common/receipt --- a/ncurses-common/receipt Fri Dec 23 16:18:28 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="ncurses-common" -VERSION="5.9" -CATEGORY="base-system" -SHORT_DESC="Common files for the ncurses and ncursesw library." -MAINTAINER="pankso@slitaz.org" -LICENSE="MIT" -WANTED="ncurses" -WEB_SITE="http://invisible-island.net/ncurses/" -HOST_ARCH="i486 arm" - -DEPENDS="glibc-base" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - # Terminfo. - mkdir -p $fs/usr/share/terminfo - for dir in a l r v x - do - mkdir $fs/usr/share/terminfo/$dir - done - cp $install/usr/share/terminfo/a/ansi \ - $fs/usr/share/terminfo/a - cp $install/usr/share/terminfo/l/linux \ - $fs/usr/share/terminfo/l - cp $install/usr/share/terminfo/r/rxvt \ - $fs/usr/share/terminfo/r - cp $install/usr/share/terminfo/x/xterm \ - $fs/usr/share/terminfo/x - cp $install/usr/share/terminfo/x/xterm-256color \ - $fs/usr/share/terminfo/x - cp $install/usr/share/terminfo/x/xterm-color \ - $fs/usr/share/terminfo/x - cp $install/usr/share/terminfo/x/xterm-new \ - $fs/usr/share/terminfo/x - cp $install/usr/share/terminfo/x/xterm-vt220 \ - $fs/usr/share/terminfo/x - cp $install/usr/share/terminfo/v/vt100 \ - $fs/usr/share/terminfo/v - cp $install/usr/share/terminfo/v/vt102* \ - $fs/usr/share/terminfo/v - - # Tabset. - cp -a $install/usr/share/tabset $fs/usr/share -} diff -r 35e3c24d2100 -r e9bd4eca24b2 ncurses-dev/receipt --- a/ncurses-dev/receipt Fri Dec 23 16:18:28 2016 +0100 +++ b/ncurses-dev/receipt Sat Dec 24 05:45:18 2016 +0200 @@ -15,5 +15,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cook_copy_files ncursesw6-config *.h *.a *.pc + cook_copy_files ncursesw6-config *.h *.a *.pc *.so + cook_split_rm $DEPENDS } diff -r 35e3c24d2100 -r e9bd4eca24b2 ncurses/receipt --- a/ncurses/receipt Fri Dec 23 16:18:28 2016 +0100 +++ b/ncurses/receipt Sat Dec 24 05:45:18 2016 +0200 @@ -14,7 +14,8 @@ DEPENDS="" BUILD_DEPENDS="flex" -SPLIT="ncurses-libform ncurses-libmenu ncurses-libpanel ncurses-extra" +SPLIT="ncurses-libform ncurses-libmenu ncurses-libpanel ncurses-extra \ +ncurses-dev" case "$ARCH" in arm) BUILD_DEPENDS="" ;; @@ -23,16 +24,7 @@ # Rules to configure and make the package. compile_rules() { -# # Ncurses need an installed /usr/bin/tic witch is in ncursesw-extra. And -# # when cross compiling we can't use the freshly cooked binary. See cook log: -# # -# #** Building terminfo database, please wait... -# #Running /usr/bin/tic to install /home/slitaz/wok/ncurses/install/usr/share/terminfo -# # -# if [ ! -d "/var/lib/tazpkg/installed/ncursesw-extra" ]; then -# echo "Installing: ncursesw-extra" -# tazpkg get-install ncursesw-extra 2>/dev/null 1>/dev/null -# fi + sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in ./configure \ --with-shared \ @@ -44,6 +36,26 @@ --with-pkg-config-libdir=/usr/lib/pkgconfig \ $CONFIGURE_ARGS && make && make install + + mkdir -p $install/lib + mv $install/usr/lib/libncursesw.so.6* $install/lib + ln -sf ../../lib/$(readlink $install/usr/lib/libncursesw.so) \ + $install/usr/lib/libncursesw.so + + for i in ncurses form panel menu; do + rm -f $install/usr/lib/lib$i.so + echo "INPUT(-l${i}w)" > $install/usr/lib/lib$i.so + chmod 755 $install/usr/lib/lib$i.so + ln -sf ${i}w.pc $install/usr/lib/pkgconfig/$i.pc + done + + rm -f $install/usr/lib/libcursesw.so + echo "INPUT(-lncursesw)" > $install/usr/lib/libcursesw.so + chmod 755 $install/usr/lib/libcursesw.so + ln -sf libncurses.so $install/usr/lib/libcurses.so + + mkdir -p $install/usr/share/doc/ncurses-$VERSION + cp -a doc/* $install/usr/share/doc/ncurses-$VERSION } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 35e3c24d2100 -r e9bd4eca24b2 psmisc/receipt --- a/psmisc/receipt Fri Dec 23 16:18:28 2016 +0100 +++ b/psmisc/receipt Sat Dec 24 05:45:18 2016 +0200 @@ -11,7 +11,7 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/psmisc/$TARBALL" -DEPENDS="libtinfo" +DEPENDS="ncurses" BUILD_DEPENDS="gettext ncurses-dev" # Rules to configure and make the package. diff -r 35e3c24d2100 -r e9bd4eca24b2 readline/receipt --- a/readline/receipt Fri Dec 23 16:18:28 2016 +0100 +++ b/readline/receipt Sat Dec 24 05:45:18 2016 +0200 @@ -23,13 +23,14 @@ esac patch -Np1 -i $stuff/readline-6.3-upstream_fixes-3.patch - sed -i '/(MV)/d' Makefile* + sed -i '/MV.*old/d' Makefile.in + sed -i '/{OLDSUFF}/c:' support/shlib-install ./configure \ - --enable-multibyte \ - --with-curses \ + --disable-static \ + --docdir=/usr/share/doc/readline-$VERSION \ $CONFIGURE_ARGS && - make SHLIB_LIBS=-lncursesw && + make SHLIB_LIBS=-lncurses && make DESTDIR=$install install } diff -r 35e3c24d2100 -r e9bd4eca24b2 texinfo/receipt --- a/texinfo/receipt Fri Dec 23 16:18:28 2016 +0100 +++ b/texinfo/receipt Sat Dec 24 05:45:18 2016 +0200 @@ -12,16 +12,13 @@ TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" -DEPENDS="libtinfo perl" +DEPENDS="perl" BUILD_DEPENDS="perl ncurses-dev gettext" # Rules to configure and make the package. compile_rules() { - ./configure \ - --disable-static \ - $CONFIGURE_ARGS && - make && make install + ./configure $CONFIGURE_ARGS && make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 35e3c24d2100 -r e9bd4eca24b2 util-linux/receipt --- a/util-linux/receipt Fri Dec 23 16:18:28 2016 +0100 +++ b/util-linux/receipt Sat Dec 24 05:45:18 2016 +0200 @@ -13,9 +13,8 @@ TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="https://www.kernel.org/pub/linux/utils/$PACKAGE/v$VER/$TARBALL" -DEPENDS="" -BUILD_DEPENDS="udev-dev ncursesw-dev libcap-ng-dev readline-dev python-dev \ -glib gtk-doc libxslt gettext ncurses-dev libtinfo zlib-dev" +BUILD_DEPENDS="udev-dev libcap-ng-dev readline-dev python-dev glib gtk-doc \ +libxslt gettext ncurses-dev zlib-dev" SPLIT="util-linux-bash-completion util-linux-blkid util-linux-blkid-dev \ util-linux-blockdev util-linux-cfdisk util-linux-column util-linux-cramfs \ util-linux-eject util-linux-fdisk util-linux-fdisk-dev util-linux-flock \