From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED7B21382C5 for ; Tue, 12 Jan 2021 09:37:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15799E0A5B; Tue, 12 Jan 2021 09:37:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E54A4E0A5B for ; Tue, 12 Jan 2021 09:37:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91B7D340DF8 for ; Tue, 12 Jan 2021 09:37:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 671144C for ; Tue, 12 Jan 2021 09:37:23 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1610444212.3f92f42f888fb0705c4679a089998a604bf2ca58.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/files/, sys-devel/bmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/bmake/Manifest sys-devel/bmake/bmake-20201222.ebuild sys-devel/bmake/files/bmake-20201222-tests.patch X-VCS-Directories: sys-devel/bmake/files/ sys-devel/bmake/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 3f92f42f888fb0705c4679a089998a604bf2ca58 X-VCS-Branch: master Date: Tue, 12 Jan 2021 09:37:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d37a7918-c838-4eb3-b99d-2b7256d6b288 X-Archives-Hash: dbf2937273cbc236ceb9a4861016c779 commit: 3f92f42f888fb0705c4679a089998a604bf2ca58 Author: Jakov Smolic sartura hr> AuthorDate: Tue Jan 12 09:36:52 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Jan 12 09:36:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f92f42f sys-devel/bmake: Bump to 20201222 Closes: https://github.com/gentoo/gentoo/pull/18993 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> sys-devel/bmake/Manifest | 1 + sys-devel/bmake/bmake-20201222.ebuild | 50 ++++++++++++++++++++++++ sys-devel/bmake/files/bmake-20201222-tests.patch | 26 ++++++++++++ 3 files changed, 77 insertions(+) diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest index 0d4c99a2030..0e18157b7f7 100644 --- a/sys-devel/bmake/Manifest +++ b/sys-devel/bmake/Manifest @@ -1,3 +1,4 @@ DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699 SHA512 a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507 DIST bmake-20201117.tar.gz 696371 BLAKE2B e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c SHA512 b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588 +DIST bmake-20201222.tar.gz 727973 BLAKE2B cd093418c646e6b15e47f08c3c8e6a5daa5db2c9a1f76b4e8d639e0a50444ad518836585af7381bb2952309dd82716046a85e42121180133c9ccd546963a7748 SHA512 ddf1152adf99b350ae1ff1dd473319cd7c277c696f29b3ccba9080ecb9da0013f334b183c46a6e0a34708071a8f4f89d813264436e1946ebdc1923e6fe7440d9 DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861 diff --git a/sys-devel/bmake/bmake-20201222.ebuild b/sys-devel/bmake/bmake-20201222.ebuild new file mode 100644 index 00000000000..547f81f91f6 --- /dev/null +++ b/sys-devel/bmake/bmake-20201222.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 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}" + +# Skip failing test (sandbox and csh) +PATCHES=( "${FILESDIR}"/${P}-tests.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-20201222-tests.patch b/sys-devel/bmake/files/bmake-20201222-tests.patch new file mode 100644 index 00000000000..9a5efb79246 --- /dev/null +++ b/sys-devel/bmake/files/bmake-20201222-tests.patch @@ -0,0 +1,26 @@ +--- a/unit-tests/Makefile ++++ b/unit-tests/Makefile +@@ -183,7 +183,6 @@ TESTS+= dotwait + TESTS+= envfirst + TESTS+= error + TESTS+= # escape # broken by reverting POSIX changes +-TESTS+= export + TESTS+= export-all + TESTS+= export-env + TESTS+= export-variants +@@ -280,7 +279,6 @@ TESTS+= sh-leading-plus + TESTS+= sh-meta-chars + TESTS+= sh-multi-line + TESTS+= sh-single-line +-TESTS+= shell-csh + TESTS+= shell-custom + .if exists(/bin/ksh) + TESTS+= shell-ksh +@@ -316,7 +314,6 @@ TESTS+= var-op-append + TESTS+= var-op-assign + TESTS+= var-op-default + TESTS+= var-op-expand +-TESTS+= var-op-shell + TESTS+= var-op-sunsh + TESTS+= var-recursive + TESTS+= varcmd