# HG changeset patch # User Pascal Bellard # Date 1586166822 -7200 # Node ID 539876c71561b924758afd4db1b509de6f716c1b # Parent 6f6f1f1ee3545c7ddca315c555555d4a66d9b80f busybox: musl & diet may fail diff -r 6f6f1f1ee354 -r 539876c71561 busybox/receipt --- a/busybox/receipt Mon Apr 06 10:53:56 2020 +0100 +++ b/busybox/receipt Mon Apr 06 11:53:42 2020 +0200 @@ -108,10 +108,11 @@ cp $stuff/$PACKAGE-${VERSION%.*}.config-static .config sed -i 's|uclibc-i486-||' .config make oldconfig | sed 's|ERROR|error|' && - make CC=musl-gcc || return 1 - mv busybox busybox-musl - mv busybox_unstripped.map busybox-musl.map - mv -f docs/busybox.1 docs/busybox.static.1 + if make CC=musl-gcc ; then + mv busybox busybox-musl + mv busybox_unstripped.map busybox-musl.map + mv -f docs/busybox.1 docs/busybox.static.1 + fi fi if [ -x /usr/lib/diet/bin/diet ]; then @@ -120,10 +121,11 @@ cp $stuff/$PACKAGE-${VERSION%.*}.config-static .config sed -i 's|uclibc-i486-||;s|CFLAGS="|&-D_BSD_SOURCE |;s|LDFLAGS="|&-Wl,--allow-multiple-definition |;s|LDLIBS="|&compat rpc |' .config make oldconfig | sed 's|ERROR|error|' && - make CC="/usr/lib/diet/bin/diet gcc" || return 1 - mv busybox busybox-diet - mv busybox_unstripped.map busybox-diet.map - mv -f docs/busybox.1 docs/busybox.static.1 + if make CC="/usr/lib/diet/bin/diet gcc" ; then + mv busybox busybox-diet + mv busybox_unstripped.map busybox-diet.map + mv -f docs/busybox.1 docs/busybox.static.1 + fi fi # prepare ssfs-busybox package diff -r 6f6f1f1ee354 -r 539876c71561 freetds/receipt --- a/freetds/receipt Mon Apr 06 10:53:56 2020 +0100 +++ b/freetds/receipt Mon Apr 06 11:53:42 2020 +0200 @@ -24,7 +24,7 @@ --mandir=/usr/share/man \ $CONFIGURE_ARGS 2>&1 | grep -v /config.rpath && make && - make DESTDIR=$DESTDIR install + make -j 1 DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 6f6f1f1ee354 -r 539876c71561 python-cheetah/receipt --- a/python-cheetah/receipt Mon Apr 06 10:53:56 2020 +0100 +++ b/python-cheetah/receipt Mon Apr 06 11:53:42 2020 +0200 @@ -7,11 +7,10 @@ SHORT_DESC="A template engine and code generation tool written in Python." MAINTAINER="pankso@slitaz.org" LICENSE="MIT" -WEB_SITE="https://www.cheetahtemplate.org/" +WEB_SITE="https://cheetahtemplate.org/" SOURCE="Cheetah" TARBALL="$SOURCE-$VERSION.tar.gz" -WEB_SITE="https://pypi.org/project/Cheetah/" WGET_URL="https://files.pythonhosted.org/packages/source/C/$SOURCE/$TARBALL" DEPENDS="python"