sys-devel/bmake: Add 20181221 version

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: David Seifert <soap@gentoo.org>

3 files changed, 68 insertions, 0 deletions

diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index d3ee4e0739c7..f7d01e9eda39 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,5 +1,7 @@
 DIST bmake-20170421.tar.gz 550626 BLAKE2B 79d3e88784cbdaf0dec8240f42543c3d11225235887c0ac7f8ed55960e6de120d196d0e865bbecd334df240971b418182b05fbe60f038f3f810d264f8fcfb850 SHA512 f984dd7697ff74455690d9f0b6a355e3bd3de7545eb93def82aeaaf1899b5316a83e36502ffdd64ef53ad2b28fbfad61cfaee17b8ec29a1f0dd6640c13b4f04f
 DIST bmake-20170510.tar.gz 552370 BLAKE2B c06263d378423a79bda8d6564e6e1bb111f3b192d79718119333429933a38840137db0e2334a7a3980bf385a448fa114bee4868e27fc732b4cc554bd99e31c13 SHA512 55300e3e375047a400912e62821a179b2a3dfdf61e39c3991fe236c5b63816f854ebb50f759a0a8a938af4b84f00eaa9cc2e172288287c019ecadfc0b359a1f6
 DIST bmake-20170812.tar.gz 554613 BLAKE2B e2e93142f12921d73dea9e2c5a92d83d02528a40d7ea1ced5ce41ce4e709f58a4728878de8d21a96add36aa68d769a3061757b0287dea1543ada93e214e0206c SHA512 2345d24967796950ba9c661e65228223da51c6f22da34ad2dbc5069e0ca56445902685f9da5cfd0f2594f6261ae778d3621670bd80fc8f840d970b6fd8f185f4
+DIST bmake-20181221.tar.gz 558806 BLAKE2B 57759a76f38431120db4d01770440b301b1170b6d24ce38930020df483010c5631e4276bd63b90204b2a01a3853c7146709b9b8b9cf1e7d958158f589269e955 SHA512 7824fb60e4ac8f9c5ab9f6a0d42720c5f3cb475851146bf8042625eb58bbd0dbacafce6969da2b51cdd6514e789a8f2a958e8b8538cd862eeea1b571da203e5b
 DIST mk-20170301.tar.gz 93049 BLAKE2B cd105225e3b523bcacd52651d2253ea8147c317ac14a335c4fe711042da6119cd477a248649d8b10033d3913e41da33eaf57f26ea363ed8013b01fed7d672d7d SHA512 9727cb284339ec00caeccadd88b55d93027991d453e507c77575135efd789d77307c84137e83616df6643039f9f2449751d4796a87828224e5a8bf48bc0925a3
 DIST mk-20170505.tar.gz 94846 BLAKE2B b32b809817d4e50b5254c106cac0f7ad33dbadaaa84cd4454faa3193fc0c1193fe5d11de67d4571bd83e3bdf2295940d452a22c1ff83fe0ef3b18ec85b512b56 SHA512 8a9303612a80afdc3c74be8176cab2c04c10c91b1dd30245645cd5441928f388e291de8fe65efd4341c1bf787d8bafaae8f02018c5353ab2916a69cb2db7334c
+DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
diff --git a/sys-devel/bmake/bmake-20181221.ebuild b/sys-devel/bmake/bmake-20181221.ebuild
new file mode 100644
index 000000000000..c7915e164c03
--- /dev/null
+++ b/sys-devel/bmake/bmake-20181221.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MK_VER=20191111
+
+DESCRIPTION="NetBSD's portable make"
+HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
+SRC_URI="
+	http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
+	http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${PN}-20181221-fix-gcc10-fno-common.patch )
+
+src_configure() {
+	econf \
+		--with-mksrc=../mk \
+		--with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
+		--with-machine_arch=${ARCH}
+}
+
+src_compile() {
+	sh make-bootstrap.sh || die "bootstrap failed"
+}
+
+src_test() {
+	cd unit-tests || die
+	LC_ALL=C env -u A "${S}"/bmake -r -m all || die "tests compilation failed"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	FORCE_BSD_MK=1 SYS_MK_DIR=. \
+		sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
+		|| die "failed to install mk files"
+}
diff --git a/sys-devel/bmake/files/bmake-20181221-fix-gcc10-fno-common.patch b/sys-devel/bmake/files/bmake-20181221-fix-gcc10-fno-common.patch
new file mode 100644
index 000000000000..affd94daefe7
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-20181221-fix-gcc10-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/make.c
++++ b/make.c
+@@ -139,6 +139,8 @@
+ static int MakeBuildChild(void *, void *);
+ static int MakeBuildParent(void *, void *);
+ 
++FILE *debug_file;
++
+ MAKE_ATTR_DEAD static void
+ make_abort(GNode *gn, int line)
+ {
+--- a/make.h
++++ b/make.h
+@@ -464,7 +464,7 @@
+  *	There is one bit per module.  It is up to the module what debug
+  *	information to print.
+  */
+-FILE *debug_file;		/* Output written here - default stdout */
++extern FILE *debug_file;		/* Output written here - default stdout */
+ extern int debug;
+ #define	DEBUG_ARCH	0x00001
+ #define	DEBUG_COND	0x00002