# HG changeset patch # User Pascal Bellard # Date 1462627694 -7200 # Node ID d1139a9dbf88ae01f0ece7728cf13bdf8b2fc15d # Parent 887b3b11683dd6a369be4bb24d04f8e4babe4c7d tk, nano, htop, gawk: fix arm build diff -r 887b3b11683d -r d1139a9dbf88 gawk/receipt --- a/gawk/receipt Sat May 07 16:09:04 2016 +0300 +++ b/gawk/receipt Sat May 07 15:28:14 2016 +0200 @@ -9,9 +9,10 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.gnu.org/software/gawk/" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" +HOST_ARCH="i486 arm" DEPENDS="" -BUILD_DEPENDS="gcc" +BUILD_DEPENDS="" # Rules to compile & install the temporary toolchain. cook_tmp_toolchain() diff -r 887b3b11683d -r d1139a9dbf88 htop/receipt --- a/htop/receipt Sat May 07 16:09:04 2016 +0300 +++ b/htop/receipt Sat May 07 15:28:14 2016 +0200 @@ -23,11 +23,12 @@ # Rules to configure and make the package. compile_rules() { - cp missing /root/ # waiting the a real fix... + # waiting the a real fix... + sed -i "s|$am_aux_dir/missing|$src/missing|" configure ./configure \ --enable-unicode \ $CONFIGURE_ARGS $CROSS_ARGS && - make && make install && rm -f /root/missing + make && make install } diff -r 887b3b11683d -r d1139a9dbf88 libpng+apng-dev/receipt --- a/libpng+apng-dev/receipt Sat May 07 16:09:04 2016 +0300 +++ b/libpng+apng-dev/receipt Sat May 07 15:28:14 2016 +0200 @@ -7,6 +7,7 @@ MAINTAINER="al.bobylev@gmail.com" LICENSE="zlib/libpng" WEB_SITE="http://libpng.org/pub/png/libpng.html" +HOST_ARCH="i486 arm" WANTED="libpng+apng" DEPENDS="libpng+apng pkg-config" diff -r 887b3b11683d -r d1139a9dbf88 libpng+apng/receipt --- a/libpng+apng/receipt Sat May 07 16:09:04 2016 +0300 +++ b/libpng+apng/receipt Sat May 07 15:28:14 2016 +0200 @@ -12,6 +12,7 @@ WEB_SITE="http://www.libpng.org/pub/png/libpng.html" TARBALL="$SOURCE-$VERSION.tar.xz" WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL" +HOST_ARCH="i486 arm" PATCH="$SOURCE-$VERSION-apng.patch.gz" PATCH_URL="$SF_MIRROR/apng/$SOURCE/$SERIES/$PATCH" @@ -29,8 +30,13 @@ --disable-static \ $CONFIGURE_ARGS && make && - make check | tr [A-Z] [a-z] && - make DESTDIR=$DESTDIR install + case "$ARCH" in + arm*) + make DESTDIR=$DESTDIR install ;; + *) + make check | tr [A-Z] [a-z] && + make DESTDIR=$DESTDIR install ;; + esac } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 887b3b11683d -r d1139a9dbf88 nano/receipt --- a/nano/receipt Sat May 07 16:09:04 2016 +0300 +++ b/nano/receipt Sat May 07 15:28:14 2016 +0200 @@ -16,6 +16,11 @@ SUGGESTED="gpm" BUILD_DEPENDS="ncursesw-dev zlib-dev groff" +# Handle cross compilation +case "$ARCH" in + arm*) BUILD_DEPENDS="ncursesw-dev zlib-dev" ;; +esac + # Rules to configure and make the package. compile_rules() { diff -r 887b3b11683d -r d1139a9dbf88 tk/receipt --- a/tk/receipt Sat May 07 16:09:04 2016 +0300 +++ b/tk/receipt Sat May 07 15:28:14 2016 +0200 @@ -20,7 +20,8 @@ compile_rules() { case "$ARCH" in - arm*) + arm*) + ARCH_ARGS="--with-tcl=/cross/arm/sysroot/usr/lib" export tcl_cv_strtod_buggy=1 export ac_cv_func_strtod=yes ;; esac @@ -29,7 +30,7 @@ --prefix=/usr \ --enable-threads \ --enable-shared \ - ${CONFIGURE_ARGS} && + $ARCH_ARGS ${CONFIGURE_ARGS} && make && make DESTDIR=$DESTDIR install }