wok-6.x rev 19115
tk, nano, htop, gawk: fix arm build
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat May 07 15:28:14 2016 +0200 (2016-05-07) |
parents | 887b3b11683d |
children | 2f45bddbfd08 |
files | gawk/receipt htop/receipt libpng+apng-dev/receipt libpng+apng/receipt nano/receipt tk/receipt |
line diff
1.1 --- a/gawk/receipt Sat May 07 16:09:04 2016 +0300 1.2 +++ b/gawk/receipt Sat May 07 15:28:14 2016 +0200 1.3 @@ -9,9 +9,10 @@ 1.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.5 WEB_SITE="http://www.gnu.org/software/gawk/" 1.6 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 1.7 +HOST_ARCH="i486 arm" 1.8 1.9 DEPENDS="" 1.10 -BUILD_DEPENDS="gcc" 1.11 +BUILD_DEPENDS="" 1.12 1.13 # Rules to compile & install the temporary toolchain. 1.14 cook_tmp_toolchain()
2.1 --- a/htop/receipt Sat May 07 16:09:04 2016 +0300 2.2 +++ b/htop/receipt Sat May 07 15:28:14 2016 +0200 2.3 @@ -23,11 +23,12 @@ 2.4 # Rules to configure and make the package. 2.5 compile_rules() 2.6 { 2.7 - cp missing /root/ # waiting the a real fix... 2.8 + # waiting the a real fix... 2.9 + sed -i "s|$am_aux_dir/missing|$src/missing|" configure 2.10 ./configure \ 2.11 --enable-unicode \ 2.12 $CONFIGURE_ARGS $CROSS_ARGS && 2.13 - make && make install && rm -f /root/missing 2.14 + make && make install 2.15 2.16 } 2.17
3.1 --- a/libpng+apng-dev/receipt Sat May 07 16:09:04 2016 +0300 3.2 +++ b/libpng+apng-dev/receipt Sat May 07 15:28:14 2016 +0200 3.3 @@ -7,6 +7,7 @@ 3.4 MAINTAINER="al.bobylev@gmail.com" 3.5 LICENSE="zlib/libpng" 3.6 WEB_SITE="http://libpng.org/pub/png/libpng.html" 3.7 +HOST_ARCH="i486 arm" 3.8 3.9 WANTED="libpng+apng" 3.10 DEPENDS="libpng+apng pkg-config"
4.1 --- a/libpng+apng/receipt Sat May 07 16:09:04 2016 +0300 4.2 +++ b/libpng+apng/receipt Sat May 07 15:28:14 2016 +0200 4.3 @@ -12,6 +12,7 @@ 4.4 WEB_SITE="http://www.libpng.org/pub/png/libpng.html" 4.5 TARBALL="$SOURCE-$VERSION.tar.xz" 4.6 WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL" 4.7 +HOST_ARCH="i486 arm" 4.8 4.9 PATCH="$SOURCE-$VERSION-apng.patch.gz" 4.10 PATCH_URL="$SF_MIRROR/apng/$SOURCE/$SERIES/$PATCH" 4.11 @@ -29,8 +30,13 @@ 4.12 --disable-static \ 4.13 $CONFIGURE_ARGS && 4.14 make && 4.15 - make check | tr [A-Z] [a-z] && 4.16 - make DESTDIR=$DESTDIR install 4.17 + case "$ARCH" in 4.18 + arm*) 4.19 + make DESTDIR=$DESTDIR install ;; 4.20 + *) 4.21 + make check | tr [A-Z] [a-z] && 4.22 + make DESTDIR=$DESTDIR install ;; 4.23 + esac 4.24 } 4.25 4.26 # Rules to gen a SliTaz package suitable for Tazpkg.
5.1 --- a/nano/receipt Sat May 07 16:09:04 2016 +0300 5.2 +++ b/nano/receipt Sat May 07 15:28:14 2016 +0200 5.3 @@ -16,6 +16,11 @@ 5.4 SUGGESTED="gpm" 5.5 BUILD_DEPENDS="ncursesw-dev zlib-dev groff" 5.6 5.7 +# Handle cross compilation 5.8 +case "$ARCH" in 5.9 + arm*) BUILD_DEPENDS="ncursesw-dev zlib-dev" ;; 5.10 +esac 5.11 + 5.12 # Rules to configure and make the package. 5.13 compile_rules() 5.14 {
6.1 --- a/tk/receipt Sat May 07 16:09:04 2016 +0300 6.2 +++ b/tk/receipt Sat May 07 15:28:14 2016 +0200 6.3 @@ -20,7 +20,8 @@ 6.4 compile_rules() 6.5 { 6.6 case "$ARCH" in 6.7 - arm*) 6.8 + arm*) 6.9 + ARCH_ARGS="--with-tcl=/cross/arm/sysroot/usr/lib" 6.10 export tcl_cv_strtod_buggy=1 6.11 export ac_cv_func_strtod=yes ;; 6.12 esac 6.13 @@ -29,7 +30,7 @@ 6.14 --prefix=/usr \ 6.15 --enable-threads \ 6.16 --enable-shared \ 6.17 - ${CONFIGURE_ARGS} && 6.18 + $ARCH_ARGS ${CONFIGURE_ARGS} && 6.19 make && 6.20 make DESTDIR=$DESTDIR install 6.21 }