diff --git a/srcpkgs/bmake/patches/disable-tests-for-cross.patch b/srcpkgs/bmake/patches/disable-tests-for-cross.patch deleted file mode 100644 index a559df36215..00000000000 --- a/srcpkgs/bmake/patches/disable-tests-for-cross.patch +++ /dev/null @@ -1,30 +0,0 @@ -Do not execute unit-tests, will fail in cross compilation. - ---- bmake/boot-strap.orig 2014-02-17 14:39:17.600113770 +0100 -+++ bmake/boot-strap 2014-02-17 14:39:32.262930460 +0100 -@@ -407,9 +407,6 @@ op_build() { - [ -s make-bootstrap.sh ] || op_configure - chmod 755 make-bootstrap.sh || exit 1 - ./make-bootstrap.sh || exit 1 -- case "$op" in -- build) op_test;; -- esac - } - - op_test() { -@@ -428,7 +425,6 @@ op_clean() { - } - - op_install() { -- op_test - case "$INSTALL_PREFIX,$INSTALL_BIN,$prefix" in - ,$HOST_TARGET/bin,*/$HOST_TARGET) - INSTALL_PREFIX=`dirname $prefix` -@@ -443,7 +439,6 @@ op_all() { - if [ -n "$INSTALL_PREFIX" ]; then - op_install - else -- op_test - MAKE_VERSION=`sed -n '/^MAKE_VERSION/ { s,.*= *,,;p; }' $srcdir/Makefile` - echo You can install by running: - echo diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template index 38c7514dc46..3eed4fa8840 100644 --- a/srcpkgs/bmake/template +++ b/srcpkgs/bmake/template @@ -1,18 +1,18 @@ # Template file for 'bmake' pkgname=bmake -version=20160512 -revision=2 +version=20160528 +revision=1 create_wrksrc=yes short_desc="Portable version of the NetBSD make build tool" maintainer="Juan RP " license="BSD" homepage="http://www.crufty.net/help/sjg/bmake.html" distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz" -checksum=6dc0cdf04452fc862731febdf5bb456d4c42a9e64f31f2fa97d8bc2c559b5d23 +checksum=e6e9f8aaffdcddfa12aca64d74f7536f240f130900b715ed29b2f9e3351f7baa do_configure() { cd bmake - sed -i 's/\^MAKE_VERSION/^_MAKE_VERSION/' boot-strap make-bootstrap.sh.in + sed -i 's/op_test() {/& return 0;/' boot-strap sed -i '1s,:,#!/bin/sh,g' install-sh if [ "$CROSS_BUILD" ]; then mkdir -p bmake-host