wok-current rev 12773

ncurses*: add to arm pakages (now will try to link ncruses apps again it :-)
author Christophe Lincoln <pankso@slitaz.org>
date Sun May 13 04:31:48 2012 +0200 (2012-05-13)
parents 198bdfe3af18
children 4478a745a1e5
files ncurses-common/receipt ncurses-dev/receipt ncurses/receipt ncursesw-dev/receipt ncursesw-extra/receipt ncursesw/receipt
line diff
     1.1 --- a/ncurses-common/receipt	Sun May 13 03:26:02 2012 +0200
     1.2 +++ b/ncurses-common/receipt	Sun May 13 04:31:48 2012 +0200
     1.3 @@ -8,6 +8,7 @@
     1.4  DEPENDS="glibc-base"
     1.5  WANTED="ncurses"
     1.6  WEB_SITE="http://invisible-island.net/ncurses/"
     1.7 +HOST_ARCH="i486 arm"
     1.8  
     1.9  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.10  genpkg_rules()
    1.11 @@ -36,7 +37,7 @@
    1.12      $fs/usr/share/terminfo/v
    1.13      cp $_pkg/usr/share/terminfo/v/vt102* \
    1.14      $fs/usr/share/terminfo/v
    1.15 -    
    1.16 +
    1.17      # Tabset.
    1.18      cp -a $_pkg/usr/share/tabset $fs/usr/share
    1.19  }
     2.1 --- a/ncurses-dev/receipt	Sun May 13 03:26:02 2012 +0200
     2.2 +++ b/ncurses-dev/receipt	Sun May 13 04:31:48 2012 +0200
     2.3 @@ -6,8 +6,10 @@
     2.4  SHORT_DESC="Devel files for the ncurses library."
     2.5  MAINTAINER="pankso@slitaz.org"
     2.6  WANTED="ncurses"
     2.7 +WEB_SITE="http://invisible-island.net/ncurses/"
     2.8 +HOST_ARCH="i486 arm"
     2.9 +
    2.10  DEPENDS="ncursesw-dev"
    2.11 -WEB_SITE="http://invisible-island.net/ncurses/"
    2.12  
    2.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.14  genpkg_rules()
    2.15 @@ -15,7 +17,7 @@
    2.16  	mkdir -p $fs/lib $fs/usr/bin
    2.17  	cp -a $_pkg/lib/*.a $fs/lib
    2.18  	# Use include file from ncursesw-dev
    2.19 -	#cp -a $_pkg/usr/include $fs/usr
    2.20 -	cp $_pkg/usr/bin/ncurses5-config $fs/usr/bin
    2.21 +	#cp -a $install/usr/include $fs/usr
    2.22 +	cp $install/usr/bin/ncurses5-config $fs/usr/bin
    2.23  	chmod 755 $fs/usr/bin/*
    2.24  }
     3.1 --- a/ncurses/receipt	Sun May 13 03:26:02 2012 +0200
     3.2 +++ b/ncurses/receipt	Sun May 13 04:31:48 2012 +0200
     3.3 @@ -4,12 +4,20 @@
     3.4  VERSION="5.9"
     3.5  CATEGORY="base-system"
     3.6  SHORT_DESC="Library of functions to manage display on terminals."
     3.7 -DEPENDS="ncurses-common"
     3.8 -BUILD_DEPENDS="gcc"
     3.9  MAINTAINER="pankso@slitaz.org"
    3.10  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.11  WEB_SITE="http://invisible-island.net/ncurses/"
    3.12  WGET_URL="ftp://invisible-island.net/ncurses/$TARBALL"
    3.13 +HOST_ARCH="i486 arm"
    3.14 +
    3.15 +# Ncurses need an installed /usr/bin/tic witch is in ncursesw-extra. And
    3.16 +# when cross compiling we can't use the freshly cooked binary. See cook log:
    3.17 +#
    3.18 +#** Building terminfo database, please wait...
    3.19 +#Running /usr/bin/tic to install /home/slitaz/wok/ncurses/install/usr/share/terminfo
    3.20 +#
    3.21 +DEPENDS="ncurses-common"
    3.22 +BUILD_DEPENDS="gcc ncursesw-extra"
    3.23  
    3.24  # Rules to compile & install the temporary toolchain.
    3.25  cook_tmp_toolchain()
    3.26 @@ -23,18 +31,20 @@
    3.27  # Rules to configure and make the package.
    3.28  compile_rules()
    3.29  {
    3.30 +	case "$ARCH" in
    3.31 +		arm) CROSS_ARGS="" ;;
    3.32 +	esac
    3.33  	cd $src
    3.34  	sed -i 's|\tsh $(srcdir)/MKhashsize.sh|\tash $(srcdir)/MKhashsize.sh|' \
    3.35  		include/Makefile.in
    3.36  	./configure \
    3.37  		--libdir=/lib \
    3.38  		--sysconfdir=/etc \
    3.39 -		--mandir=/usr/share/man \
    3.40  		--with-shared \
    3.41  		--without-debug \
    3.42  		--without-ada \
    3.43 -		--build=$HOST_SYSTEM \
    3.44 -		--host=$HOST_SYSTEM  &&
    3.45 +		--with-build-cc="gcc -D_GNU_SOURCE" \
    3.46 +		$CONFIGURE_ARGS &&
    3.47  	make && make install
    3.48  }
    3.49  
    3.50 @@ -42,5 +52,5 @@
    3.51  genpkg_rules()
    3.52  {
    3.53      mkdir -p $fs/lib
    3.54 -    cp -a $_pkg/lib/libncurses.so* $fs/lib
    3.55 +    cp -a $install/lib/libncurses.so* $fs/lib
    3.56  }
     4.1 --- a/ncursesw-dev/receipt	Sun May 13 03:26:02 2012 +0200
     4.2 +++ b/ncursesw-dev/receipt	Sun May 13 04:31:48 2012 +0200
     4.3 @@ -7,15 +7,16 @@
     4.4  MAINTAINER="pankso@slitaz.org"
     4.5  WANTED="ncursesw"
     4.6  WEB_SITE="http://invisible-island.net/ncurses/"
     4.7 +HOST_ARCH="i486 arm"
     4.8  
     4.9  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.10  genpkg_rules()
    4.11  {
    4.12  	mkdir -p $fs/lib $fs/usr/bin
    4.13 -	cp -a $_pkg/lib/*.a $fs/lib
    4.14 -	# Include files have the same name as ncuses-dev but seems 
    4.15 -	# to work for both.
    4.16 -	cp -a $_pkg/usr/include $fs/usr
    4.17 -	cp $_pkg/usr/bin/ncursesw5-config $fs/usr/bin
    4.18 +	cp -a $install/lib/*.a $fs/lib
    4.19 +	# Include files are from the same source than ncuses-dev and work
    4.20 +	# nicely for both.
    4.21 +	cp -a $install/usr/include $fs/usr
    4.22 +	cp $install/usr/bin/ncursesw5-config $fs/usr/bin
    4.23  	chmod 755 $fs/usr/bin/*
    4.24  }
     5.1 --- a/ncursesw-extra/receipt	Sun May 13 03:26:02 2012 +0200
     5.2 +++ b/ncursesw-extra/receipt	Sun May 13 04:31:48 2012 +0200
     5.3 @@ -8,16 +8,17 @@
     5.4  WANTED="ncursesw"
     5.5  DEPENDS="ncursesw ncurses-extra"
     5.6  WEB_SITE="http://invisible-island.net/ncurses/"
     5.7 +HOST_ARCH="i486 arm"
     5.8  
     5.9  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.10  genpkg_rules()
    5.11  {
    5.12  	mkdir -p $fs/usr
    5.13 -	cp -a $_pkg/usr/bin $fs/usr
    5.14 +	cp -a $install/usr/bin $fs/usr
    5.15  	chmod 755 $fs/usr/bin/*
    5.16 -	# Remove already provided by other packages
    5.17 +	# Remove tools already provided by other packages
    5.18  	rm -f $fs/usr/bin/ncursesw5-config
    5.19 -	rm -f $fs/usr/bin/clear 
    5.20 +	rm -f $fs/usr/bin/clear
    5.21  	rm -f $fs/usr/bin/tset
    5.22  	rm -f $fs/usr/bin/reset
    5.23  }
     6.1 --- a/ncursesw/receipt	Sun May 13 03:26:02 2012 +0200
     6.2 +++ b/ncursesw/receipt	Sun May 13 04:31:48 2012 +0200
     6.3 @@ -9,6 +9,16 @@
     6.4  TARBALL="$SOURCE-$VERSION.tar.gz"
     6.5  WEB_SITE="http://invisible-island.net/ncurses/"
     6.6  WGET_URL="ftp://invisible-island.net/ncurses/$TARBALL"
     6.7 +HOST_ARCH="i486 arm"
     6.8 +
     6.9 +# Ncursesw need an installed /usr/bin/tic witch is in ncursesw-extra. And
    6.10 +# when cross compiling we can't use the freshly cooked binary. See cook log:
    6.11 +#
    6.12 +#** Building terminfo database, please wait...
    6.13 +#Running /usr/bin/tic to install /home/slitaz/wok/ncurses/install/usr/share/terminfo
    6.14 +#
    6.15 +DEPENDS="ncurses-common"
    6.16 +BUILD_DEPENDS="gcc ncursesw-extra"
    6.17  
    6.18  # Rules to configure and make the package.
    6.19  compile_rules()
    6.20 @@ -23,8 +33,8 @@
    6.21  		--without-debug \
    6.22  		--without-ada \
    6.23  		--enable-widec \
    6.24 -		--build=$HOST_SYSTEM \
    6.25 -		--host=$HOST_SYSTEM &&
    6.26 +		--with-build-cc="gcc -D_GNU_SOURCE" \
    6.27 +		$CONFIGURE_ARGS &&
    6.28  	make && make install
    6.29  }
    6.30  
    6.31 @@ -32,25 +42,25 @@
    6.32  genpkg_rules()
    6.33  {
    6.34  	mkdir -p $fs/lib $fs/usr/bin
    6.35 -	
    6.36 +
    6.37  	# Libs.
    6.38 -	cp -a $_pkg/lib/libncursesw.so* $fs/lib
    6.39 -	
    6.40 +	cp -a $install/lib/libncursesw.so* $fs/lib
    6.41 +
    6.42  	# Base progs.
    6.43 -	cp $_pkg/usr/bin/clear $fs/usr/bin
    6.44 -	cp $_pkg/usr/bin/tset $fs/usr/bin
    6.45 -	cp $_pkg/usr/bin/reset $fs/usr/bin
    6.46 +	cp $install/usr/bin/clear $fs/usr/bin
    6.47 +	cp $install/usr/bin/tset $fs/usr/bin
    6.48 +	cp $install/usr/bin/reset $fs/usr/bin
    6.49  }
    6.50  
    6.51  # Overlap busybox
    6.52  pre_install()
    6.53  {
    6.54 -	rm -f $1/usr/bin/clear
    6.55 -	rm -f $1/usr/bin/reset
    6.56 +	rm -f $root/usr/bin/clear
    6.57 +	rm -f $root/usr/bin/reset
    6.58  }
    6.59  
    6.60  post_remove()
    6.61  {
    6.62 -	ln -s /bin/busybox $1/usr/bin/clear
    6.63 -	ln -s /bin/busybox $1/usr/bin/reset
    6.64 +	ln -s /bin/busybox $root/usr/bin/clear
    6.65 +	ln -s /bin/busybox $root/usr/bin/reset
    6.66  }