# HG changeset patch # User Christophe Lincoln # Date 1336876308 -7200 # Node ID 7c64b51d0a8c2eb7bd18ea0aefaa515a891e40e6 # Parent 198bdfe3af189b0d95eb9c16102ff7cbb7458111 ncurses*: add to arm pakages (now will try to link ncruses apps again it :-) diff -r 198bdfe3af18 -r 7c64b51d0a8c ncurses-common/receipt --- a/ncurses-common/receipt Sun May 13 03:26:02 2012 +0200 +++ b/ncurses-common/receipt Sun May 13 04:31:48 2012 +0200 @@ -8,6 +8,7 @@ DEPENDS="glibc-base" WANTED="ncurses" WEB_SITE="http://invisible-island.net/ncurses/" +HOST_ARCH="i486 arm" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() @@ -36,7 +37,7 @@ $fs/usr/share/terminfo/v cp $_pkg/usr/share/terminfo/v/vt102* \ $fs/usr/share/terminfo/v - + # Tabset. cp -a $_pkg/usr/share/tabset $fs/usr/share } diff -r 198bdfe3af18 -r 7c64b51d0a8c ncurses-dev/receipt --- a/ncurses-dev/receipt Sun May 13 03:26:02 2012 +0200 +++ b/ncurses-dev/receipt Sun May 13 04:31:48 2012 +0200 @@ -6,8 +6,10 @@ SHORT_DESC="Devel files for the ncurses library." MAINTAINER="pankso@slitaz.org" WANTED="ncurses" +WEB_SITE="http://invisible-island.net/ncurses/" +HOST_ARCH="i486 arm" + DEPENDS="ncursesw-dev" -WEB_SITE="http://invisible-island.net/ncurses/" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() @@ -15,7 +17,7 @@ mkdir -p $fs/lib $fs/usr/bin cp -a $_pkg/lib/*.a $fs/lib # Use include file from ncursesw-dev - #cp -a $_pkg/usr/include $fs/usr - cp $_pkg/usr/bin/ncurses5-config $fs/usr/bin + #cp -a $install/usr/include $fs/usr + cp $install/usr/bin/ncurses5-config $fs/usr/bin chmod 755 $fs/usr/bin/* } diff -r 198bdfe3af18 -r 7c64b51d0a8c ncurses/receipt --- a/ncurses/receipt Sun May 13 03:26:02 2012 +0200 +++ b/ncurses/receipt Sun May 13 04:31:48 2012 +0200 @@ -4,12 +4,20 @@ VERSION="5.9" CATEGORY="base-system" SHORT_DESC="Library of functions to manage display on terminals." -DEPENDS="ncurses-common" -BUILD_DEPENDS="gcc" MAINTAINER="pankso@slitaz.org" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://invisible-island.net/ncurses/" WGET_URL="ftp://invisible-island.net/ncurses/$TARBALL" +HOST_ARCH="i486 arm" + +# 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 +# +DEPENDS="ncurses-common" +BUILD_DEPENDS="gcc ncursesw-extra" # Rules to compile & install the temporary toolchain. cook_tmp_toolchain() @@ -23,18 +31,20 @@ # Rules to configure and make the package. compile_rules() { + case "$ARCH" in + arm) CROSS_ARGS="" ;; + esac cd $src sed -i 's|\tsh $(srcdir)/MKhashsize.sh|\tash $(srcdir)/MKhashsize.sh|' \ include/Makefile.in ./configure \ --libdir=/lib \ --sysconfdir=/etc \ - --mandir=/usr/share/man \ --with-shared \ --without-debug \ --without-ada \ - --build=$HOST_SYSTEM \ - --host=$HOST_SYSTEM && + --with-build-cc="gcc -D_GNU_SOURCE" \ + $CONFIGURE_ARGS && make && make install } @@ -42,5 +52,5 @@ genpkg_rules() { mkdir -p $fs/lib - cp -a $_pkg/lib/libncurses.so* $fs/lib + cp -a $install/lib/libncurses.so* $fs/lib } diff -r 198bdfe3af18 -r 7c64b51d0a8c ncursesw-dev/receipt --- a/ncursesw-dev/receipt Sun May 13 03:26:02 2012 +0200 +++ b/ncursesw-dev/receipt Sun May 13 04:31:48 2012 +0200 @@ -7,15 +7,16 @@ MAINTAINER="pankso@slitaz.org" WANTED="ncursesw" 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 $fs/usr/bin - cp -a $_pkg/lib/*.a $fs/lib - # Include files have the same name as ncuses-dev but seems - # to work for both. - cp -a $_pkg/usr/include $fs/usr - cp $_pkg/usr/bin/ncursesw5-config $fs/usr/bin + cp -a $install/lib/*.a $fs/lib + # Include files are from the same source than ncuses-dev and work + # nicely for both. + cp -a $install/usr/include $fs/usr + cp $install/usr/bin/ncursesw5-config $fs/usr/bin chmod 755 $fs/usr/bin/* } diff -r 198bdfe3af18 -r 7c64b51d0a8c ncursesw-extra/receipt --- a/ncursesw-extra/receipt Sun May 13 03:26:02 2012 +0200 +++ b/ncursesw-extra/receipt Sun May 13 04:31:48 2012 +0200 @@ -8,16 +8,17 @@ WANTED="ncursesw" DEPENDS="ncursesw ncurses-extra" 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/usr - cp -a $_pkg/usr/bin $fs/usr + cp -a $install/usr/bin $fs/usr chmod 755 $fs/usr/bin/* - # Remove already provided by other packages + # Remove tools already provided by other packages rm -f $fs/usr/bin/ncursesw5-config - rm -f $fs/usr/bin/clear + rm -f $fs/usr/bin/clear rm -f $fs/usr/bin/tset rm -f $fs/usr/bin/reset } diff -r 198bdfe3af18 -r 7c64b51d0a8c ncursesw/receipt --- a/ncursesw/receipt Sun May 13 03:26:02 2012 +0200 +++ b/ncursesw/receipt Sun May 13 04:31:48 2012 +0200 @@ -9,6 +9,16 @@ TARBALL="$SOURCE-$VERSION.tar.gz" WEB_SITE="http://invisible-island.net/ncurses/" WGET_URL="ftp://invisible-island.net/ncurses/$TARBALL" +HOST_ARCH="i486 arm" + +# Ncursesw 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 +# +DEPENDS="ncurses-common" +BUILD_DEPENDS="gcc ncursesw-extra" # Rules to configure and make the package. compile_rules() @@ -23,8 +33,8 @@ --without-debug \ --without-ada \ --enable-widec \ - --build=$HOST_SYSTEM \ - --host=$HOST_SYSTEM && + --with-build-cc="gcc -D_GNU_SOURCE" \ + $CONFIGURE_ARGS && make && make install } @@ -32,25 +42,25 @@ genpkg_rules() { mkdir -p $fs/lib $fs/usr/bin - + # Libs. - cp -a $_pkg/lib/libncursesw.so* $fs/lib - + cp -a $install/lib/libncursesw.so* $fs/lib + # Base progs. - cp $_pkg/usr/bin/clear $fs/usr/bin - cp $_pkg/usr/bin/tset $fs/usr/bin - cp $_pkg/usr/bin/reset $fs/usr/bin + cp $install/usr/bin/clear $fs/usr/bin + cp $install/usr/bin/tset $fs/usr/bin + cp $install/usr/bin/reset $fs/usr/bin } # Overlap busybox pre_install() { - rm -f $1/usr/bin/clear - rm -f $1/usr/bin/reset + rm -f $root/usr/bin/clear + rm -f $root/usr/bin/reset } post_remove() { - ln -s /bin/busybox $1/usr/bin/clear - ln -s /bin/busybox $1/usr/bin/reset + ln -s /bin/busybox $root/usr/bin/clear + ln -s /bin/busybox $root/usr/bin/reset }