commit: b6f3f1acda9894c320f4bca8b5b46bad6ac0c9bc Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Fri Feb 19 11:47:39 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Feb 19 11:47:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6f3f1ac
sys-devel/bmake: Remove old Closes: https://github.com/gentoo/gentoo/pull/19540 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-devel/bmake/Manifest | 1 - sys-devel/bmake/bmake-20200318.ebuild | 49 ---------------------- .../bmake-20181221-fix-gcc10-fno-common.patch | 22 ---------- 3 files changed, 72 deletions(-) diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest index 0a8bb4891aa..a4d150c0ab1 100644 --- a/sys-devel/bmake/Manifest +++ b/sys-devel/bmake/Manifest @@ -1,4 +1,3 @@ -DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699 SHA512 a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507 DIST bmake-20201117.tar.gz 696371 BLAKE2B e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c SHA512 b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588 DIST bmake-20210206.tar.gz 740065 BLAKE2B 2482b980ad4e4aac4292e0244020eeb3699148d84b0f493865a8317673eddb20ed48219f1319c490c6a88c6f1c50a44bd95af5de43f5853876bd10c1aef9b4bd SHA512 abda3aadd49abfe0e7801f4c37539a9172c3bb2d6ed542e0dec5b6177a799774a4b513041ff6167409c69ac6af35f506b1d6e585694259192a65a8575c232839 DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861 diff --git a/sys-devel/bmake/bmake-20200318.ebuild b/sys-devel/bmake/bmake-20200318.ebuild deleted file mode 100644 index b0c8b6fb0d9..00000000000 --- a/sys-devel/bmake/bmake-20200318.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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 - - # the 'ternary' test uses ${A} internally, which - # conflicts with Gentoo's ${A}, hence unset it for - # the tests temporarily. - env -u A MAKEFLAGS= \ - "${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || 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 deleted file mode 100644 index affd94daefe..00000000000 --- a/sys-devel/bmake/files/bmake-20181221-fix-gcc10-fno-common.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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
