aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--testing/bmake/APKBUILD19
-rw-r--r--testing/bmake/disable-automatic-tests.patch22
2 files changed, 35 insertions, 6 deletions
diff --git a/testing/bmake/APKBUILD b/testing/bmake/APKBUILD
index 820cd326d6..437823dfd0 100644
--- a/testing/bmake/APKBUILD
+++ b/testing/bmake/APKBUILD
@@ -1,23 +1,29 @@
# Maintainer: Steffen Nurpmeso <steffen@sdaoden.eu>
pkgname=bmake
pkgver=20181221
-pkgrel=0
+pkgrel=1
pkgdesc="Portable version of the NetBSD make build tool"
url="http://www.crufty.net/help/sjg/bmake.html"
arch="x86_64"
license="BSD"
subpackages="$pkgname-doc"
source="http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz
- install-sh.patch"
-
+ install-sh.patch
+ disable-automatic-tests.patch
+ "
+options="!check" # FIXME: tests fail on builders
builddir="$srcdir/$pkgname"
-options="!check" # Check automatically performed after build
build() {
cd "$builddir"
mkdir -p build
cd build
- sh ../boot-strap --with-default-sys-path=/usr/share/mk
+ sh ../boot-strap op=build --with-default-sys-path=/usr/share/mk
+}
+
+check() {
+ cd "$builddir/build"
+ sh ../boot-strap op=test
}
package() {
@@ -34,4 +40,5 @@ package() {
}
sha512sums="7824fb60e4ac8f9c5ab9f6a0d42720c5f3cb475851146bf8042625eb58bbd0dbacafce6969da2b51cdd6514e789a8f2a958e8b8538cd862eeea1b571da203e5b bmake-20181221.tar.gz
-0de9022a2991c5ef02c09ab592a3e2d218cd0bbf58e54f21bc7694110f3dd9e4589bf2b3d241fd167fb220b425007863f20e71e141b4f65bf92d305ba94209da install-sh.patch"
+0de9022a2991c5ef02c09ab592a3e2d218cd0bbf58e54f21bc7694110f3dd9e4589bf2b3d241fd167fb220b425007863f20e71e141b4f65bf92d305ba94209da install-sh.patch
+aa20b59928b3d2a28bc407f41b56db16d6cb42d2ee8aea4ec37b2c4ef838633ac93d8fa78aaa813e9025723f394fceab379ec75860889df35e9fbe470c626e55 disable-automatic-tests.patch"
diff --git a/testing/bmake/disable-automatic-tests.patch b/testing/bmake/disable-automatic-tests.patch
new file mode 100644
index 0000000000..3dc975d889
--- /dev/null
+++ b/testing/bmake/disable-automatic-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/boot-strap b/boot-strap
+index af128b4..5ade9fb 100755
+--- a/boot-strap
++++ b/boot-strap
+@@ -414,9 +414,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() {
+@@ -435,7 +432,6 @@ op_clean() {
+ }
+
+ op_install() {
+- op_test
+ case "$INSTALL_PREFIX,$INSTALL_BIN,$prefix" in
+ ,$HOST_TARGET/bin,*/$HOST_TARGET)
+ INSTALL_PREFIX=`dirname $prefix`