wok-6.x rev 23513

busybox: musl & diet may fail
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Apr 06 11:53:42 2020 +0200 (2020-04-06)
parents 6f6f1f1ee354
children a9aa30e5bd71
files busybox/receipt freetds/receipt python-cheetah/receipt
line diff
     1.1 --- a/busybox/receipt	Mon Apr 06 10:53:56 2020 +0100
     1.2 +++ b/busybox/receipt	Mon Apr 06 11:53:42 2020 +0200
     1.3 @@ -108,10 +108,11 @@
     1.4  			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .config
     1.5  			sed -i 's|uclibc-i486-||' .config
     1.6  			make oldconfig | sed 's|ERROR|error|' &&
     1.7 -			make CC=musl-gcc || return 1
     1.8 -			mv busybox busybox-musl
     1.9 -			mv busybox_unstripped.map busybox-musl.map
    1.10 -			mv -f docs/busybox.1 docs/busybox.static.1
    1.11 +			if make CC=musl-gcc ; then
    1.12 +				mv busybox busybox-musl
    1.13 +				mv busybox_unstripped.map busybox-musl.map
    1.14 +				mv -f docs/busybox.1 docs/busybox.static.1
    1.15 +			fi
    1.16  		    fi
    1.17  
    1.18  		    if [ -x /usr/lib/diet/bin/diet ]; then
    1.19 @@ -120,10 +121,11 @@
    1.20  			cp $stuff/$PACKAGE-${VERSION%.*}.config-static .config
    1.21  			sed -i 's|uclibc-i486-||;s|CFLAGS="|&-D_BSD_SOURCE |;s|LDFLAGS="|&-Wl,--allow-multiple-definition |;s|LDLIBS="|&compat rpc |' .config
    1.22  			make oldconfig | sed 's|ERROR|error|' &&
    1.23 -			make CC="/usr/lib/diet/bin/diet gcc" || return 1
    1.24 -			mv busybox busybox-diet
    1.25 -			mv busybox_unstripped.map busybox-diet.map
    1.26 -			mv -f docs/busybox.1 docs/busybox.static.1
    1.27 +			if make CC="/usr/lib/diet/bin/diet gcc" ; then
    1.28 +				mv busybox busybox-diet
    1.29 +				mv busybox_unstripped.map busybox-diet.map
    1.30 +				mv -f docs/busybox.1 docs/busybox.static.1
    1.31 +			fi
    1.32  		    fi
    1.33  
    1.34  		    # prepare ssfs-busybox package
     2.1 --- a/freetds/receipt	Mon Apr 06 10:53:56 2020 +0100
     2.2 +++ b/freetds/receipt	Mon Apr 06 11:53:42 2020 +0200
     2.3 @@ -24,7 +24,7 @@
     2.4  		--mandir=/usr/share/man		\
     2.5  		$CONFIGURE_ARGS 2>&1 | grep -v /config.rpath &&
     2.6  	make &&
     2.7 -	make DESTDIR=$DESTDIR install
     2.8 +	make -j 1 DESTDIR=$DESTDIR install
     2.9  }
    2.10  
    2.11  # Rules to gen a SliTaz package suitable for Tazpkg.
     3.1 --- a/python-cheetah/receipt	Mon Apr 06 10:53:56 2020 +0100
     3.2 +++ b/python-cheetah/receipt	Mon Apr 06 11:53:42 2020 +0200
     3.3 @@ -7,11 +7,10 @@
     3.4  SHORT_DESC="A template engine and code generation tool written in Python."
     3.5  MAINTAINER="pankso@slitaz.org"
     3.6  LICENSE="MIT"
     3.7 -WEB_SITE="https://www.cheetahtemplate.org/"
     3.8 +WEB_SITE="https://cheetahtemplate.org/"
     3.9  
    3.10  SOURCE="Cheetah"
    3.11  TARBALL="$SOURCE-$VERSION.tar.gz"
    3.12 -WEB_SITE="https://pypi.org/project/Cheetah/"
    3.13  WGET_URL="https://files.pythonhosted.org/packages/source/C/$SOURCE/$TARBALL"
    3.14  
    3.15  DEPENDS="python"