Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/, sys-devel/bmake/files/
Date: Mon, 30 Nov 2020 21:05:07
Message-Id: 1606770282.66a17a826adf8e3e9dec01c21a69fb1606bef4cd.soap@gentoo
1 commit: 66a17a826adf8e3e9dec01c21a69fb1606bef4cd
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Mon Nov 30 21:04:42 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 30 21:04:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a17a82
7
8 sys-devel/bmake: Update to 20201117
9
10 Closes: https://github.com/gentoo/gentoo/pull/18463
11 Package-Manager: Portage-3.0.9, Repoman-3.0.1
12 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
13 Signed-off-by: David Seifert <soap <AT> gentoo.org>
14
15 sys-devel/bmake/Manifest | 1 +
16 sys-devel/bmake/bmake-20201117.ebuild | 50 ++++++++++++++++++++++++
17 sys-devel/bmake/files/bmake-20201117-tests.patch | 18 +++++++++
18 3 files changed, 69 insertions(+)
19
20 diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
21 index 5e0994e616b..0d4c99a2030 100644
22 --- a/sys-devel/bmake/Manifest
23 +++ b/sys-devel/bmake/Manifest
24 @@ -1,2 +1,3 @@
25 DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699 SHA512 a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507
26 +DIST bmake-20201117.tar.gz 696371 BLAKE2B e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c SHA512 b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588
27 DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
28
29 diff --git a/sys-devel/bmake/bmake-20201117.ebuild b/sys-devel/bmake/bmake-20201117.ebuild
30 new file mode 100644
31 index 00000000000..c6523437bb3
32 --- /dev/null
33 +++ b/sys-devel/bmake/bmake-20201117.ebuild
34 @@ -0,0 +1,50 @@
35 +# Copyright 1999-2020 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +
40 +MK_VER=20191111
41 +
42 +DESCRIPTION="NetBSD's portable make"
43 +HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
44 +SRC_URI="
45 + http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
46 + http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
47 +
48 +LICENSE="BSD"
49 +SLOT="0"
50 +KEYWORDS="~amd64 ~ppc ~x86"
51 +
52 +S="${WORKDIR}/${PN}"
53 +
54 +# Skip failing test (sandbox and csh)
55 +PATCHES=( "${FILESDIR}"/${P}-tests.patch )
56 +
57 +src_configure() {
58 + econf \
59 + --with-mksrc=../mk \
60 + --with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
61 + --with-machine_arch=${ARCH}
62 +}
63 +
64 +src_compile() {
65 + sh make-bootstrap.sh || die "bootstrap failed"
66 +}
67 +
68 +src_test() {
69 + cd unit-tests || die
70 +
71 + # the 'ternary' test uses ${A} internally, which
72 + # conflicts with Gentoo's ${A}, hence unset it for
73 + # the tests temporarily.
74 + env -u A MAKEFLAGS= \
75 + "${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || die "tests compilation failed"
76 +}
77 +
78 +src_install() {
79 + dobin ${PN}
80 + doman ${PN}.1
81 + FORCE_BSD_MK=1 SYS_MK_DIR=. \
82 + sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
83 + || die "failed to install mk files"
84 +}
85
86 diff --git a/sys-devel/bmake/files/bmake-20201117-tests.patch b/sys-devel/bmake/files/bmake-20201117-tests.patch
87 new file mode 100644
88 index 00000000000..8955f1d89bd
89 --- /dev/null
90 +++ b/sys-devel/bmake/files/bmake-20201117-tests.patch
91 @@ -0,0 +1,18 @@
92 +--- a/unit-tests/Makefile
93 ++++ b/unit-tests/Makefile
94 +@@ -168,7 +168,6 @@
95 + TESTS+= envfirst
96 + TESTS+= error
97 + TESTS+= # escape # broken by reverting POSIX changes
98 +-TESTS+= export
99 + TESTS+= export-all
100 + TESTS+= export-env
101 + TESTS+= export-variants
102 +@@ -255,7 +254,6 @@
103 + TESTS+= sh-meta-chars
104 + TESTS+= sh-multi-line
105 + TESTS+= sh-single-line
106 +-TESTS+= shell-csh
107 + TESTS+= shell-custom
108 + .if exists(/bin/ksh)
109 + TESTS+= shell-ksh