aboutsummaryrefslogtreecommitdiffstats
path: root/testing/bmake
diff options
context:
space:
mode:
authorSteffen Nurpmeso <steffen@sdaoden.eu>2019-03-11 18:14:39 +0100
committerLeonardo Arena <rnalrd@alpinelinux.org>2019-03-13 11:04:59 +0000
commit5baa345f6147624af4fffd6393fe453baab0fff1 (patch)
tree7d746a9700e9ada90c85427bd0e444ce133c6491 /testing/bmake
parent74b71a4cdb5dda7611b54afcd44ad009a8a65ee8 (diff)
downloadaports-5baa345f6147624af4fffd6393fe453baab0fff1.tar.bz2
aports-5baa345f6147624af4fffd6393fe453baab0fff1.tar.xz
testing/bmake: update to 20181221
Diffstat (limited to 'testing/bmake')
-rw-r--r--testing/bmake/APKBUILD6
-rw-r--r--testing/bmake/sjg.patch59
2 files changed, 3 insertions, 62 deletions
diff --git a/testing/bmake/APKBUILD b/testing/bmake/APKBUILD
index 10e98521b0..820cd326d6 100644
--- a/testing/bmake/APKBUILD
+++ b/testing/bmake/APKBUILD
@@ -1,10 +1,10 @@
# Maintainer: Steffen Nurpmeso <steffen@sdaoden.eu>
pkgname=bmake
-pkgver=20180919
+pkgver=20181221
pkgrel=0
pkgdesc="Portable version of the NetBSD make build tool"
url="http://www.crufty.net/help/sjg/bmake.html"
-arch=""
+arch="x86_64"
license="BSD"
subpackages="$pkgname-doc"
source="http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz
@@ -33,5 +33,5 @@ package() {
"$pkgdir"/usr/share/licenses/"$pkgname"/COPYING
}
-sha512sums="5147513a0fd05b73ccd5ab057bcfd9e0c5d21681a5229d8ea870da7ad72fbd140b4b89245fdb2ef276152d237e478d64923623b99ce7bb85f746b01593d4fd1a bmake-20180919.tar.gz
+sha512sums="7824fb60e4ac8f9c5ab9f6a0d42720c5f3cb475851146bf8042625eb58bbd0dbacafce6969da2b51cdd6514e789a8f2a958e8b8538cd862eeea1b571da203e5b bmake-20181221.tar.gz
0de9022a2991c5ef02c09ab592a3e2d218cd0bbf58e54f21bc7694110f3dd9e4589bf2b3d241fd167fb220b425007863f20e71e141b4f65bf92d305ba94209da install-sh.patch"
diff --git a/testing/bmake/sjg.patch b/testing/bmake/sjg.patch
deleted file mode 100644
index 11b617b91a..0000000000
--- a/testing/bmake/sjg.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From sjg@crufty.net Wed Oct 4 00:46:22 2017
-From: Simon Gerraty <sjg@crufty.net>
-To: Steffen Nurpmeso <steffen@sdaoden.eu>
-Subject: Re: bmake: errors when creating Alpine Linux/Musl package
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-ID: <24543.1507070779.1@bad.crufty.net>
-Date: Tue, 03 Oct 2017 15:46:19 -0700
-Message-ID: <20363.1507070779@bad.crufty.net>
-Status: RO
-
-> |The warning about __inline being redefined - I would not expect
-> |missing/sys/cdefs.h to be used on a Linux platform - every one I'd used
-> |(not many) has sys/cdefs.h
-
-Not much we can do about that warning.
-Fortunately nothing in bmake uses __inline
-
-For the tcc getopt bit, try running strings on the object
-to see where that Del char is.
-
-For gcc, try the patch below
-
-Index: unit-tests/dotwait.exp
-===================================================================
-RCS file: /volume/cvs/bmake/unit-tests/dotwait.exp,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 dotwait.exp
---- XXX/unit-tests/dotwait.exp 30 Aug 2014 18:57:18 -0000 1.1.1.1
-+++ XXX/unit-tests/dotwait.exp 3 Oct 2017 22:43:52 -0000
-@@ -22,9 +22,9 @@ shared.2.1
- shared.2.1
- shared.2.99
- shared.2.99
-+cycle.1.99
-+cycle.1.99
- make: Graph cycles through `cycle.2.99'
- make: Graph cycles through `cycle.2.98'
- make: Graph cycles through `cycle.2.97'
--cycle.1.99
--cycle.1.99
- exit status 0
-Index: unit-tests/dotwait.mk
-===================================================================
-RCS file: /volume/cvs/bmake/unit-tests/dotwait.mk,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 dotwait.mk
---- XXX/unit-tests/dotwait.mk 30 Aug 2014 18:57:18 -0000 1.1.1.1
-+++ XXX/unit-tests/dotwait.mk 3 Oct 2017 22:42:44 -0000
-@@ -11,7 +11,7 @@ PAUSE= sleep 1
- # Ignore "--- target ---" lines printed by parallel make.
- all:
- .for t in ${TESTS}
-- @${.MAKE} -f ${THISMAKEFILE} -j4 $t | grep -v "^--- "
-+ @${.MAKE} -f ${THISMAKEFILE} -j4 $t 2>&1 | grep -v "^--- "
- .endfor
-
- #
-