* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/, sys-devel/bmake/files/
@ 2020-11-30 21:05 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2020-11-30 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 66a17a826adf8e3e9dec01c21a69fb1606bef4cd
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Nov 30 21:04:42 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 21:04:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a17a82
sys-devel/bmake: Update to 20201117
Closes: https://github.com/gentoo/gentoo/pull/18463
Package-Manager: Portage-3.0.9, Repoman-3.0.1
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-20201117.ebuild | 50 ++++++++++++++++++++++++
sys-devel/bmake/files/bmake-20201117-tests.patch | 18 +++++++++
3 files changed, 69 insertions(+)
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 5e0994e616b..0d4c99a2030 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,2 +1,3 @@
DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699 SHA512 a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507
+DIST bmake-20201117.tar.gz 696371 BLAKE2B e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c SHA512 b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588
DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
diff --git a/sys-devel/bmake/bmake-20201117.ebuild b/sys-devel/bmake/bmake-20201117.ebuild
new file mode 100644
index 00000000000..c6523437bb3
--- /dev/null
+++ b/sys-devel/bmake/bmake-20201117.ebuild
@@ -0,0 +1,50 @@
+# 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}"
+
+# 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-20201117-tests.patch b/sys-devel/bmake/files/bmake-20201117-tests.patch
new file mode 100644
index 00000000000..8955f1d89bd
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-20201117-tests.patch
@@ -0,0 +1,18 @@
+--- a/unit-tests/Makefile
++++ b/unit-tests/Makefile
+@@ -168,7 +168,6 @@
+ TESTS+= envfirst
+ TESTS+= error
+ TESTS+= # escape # broken by reverting POSIX changes
+-TESTS+= export
+ TESTS+= export-all
+ TESTS+= export-env
+ TESTS+= export-variants
+@@ -255,7 +254,6 @@
+ 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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/, sys-devel/bmake/files/
@ 2021-01-24 19:24 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-01-24 19:24 UTC (permalink / raw
To: gentoo-commits
commit: a1c35bc9521ad61d442ae8a35b1f3f292adacd37
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Jan 24 19:23:52 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 19:23:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c35bc9
sys-devel/bmake: Bump to 20210110
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-20210110.ebuild | 50 ++++++++++++++++++++++++
sys-devel/bmake/files/bmake-20210110-tests.patch | 26 ++++++++++++
3 files changed, 77 insertions(+)
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 0e18157b7f7..10644e10ac6 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,4 +1,5 @@
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 bmake-20210110.tar.gz 735461 BLAKE2B e12882507bff3b47e4531519437e5e3c8fd0628edf8cbf7ca82b2e96745a767bead62f9a61bf3b99c1757803e29dfe757e0b2a48e2a2275a1ceaef1c63db9e24 SHA512 5b68b806a32a068e54d2a79796e99c189a6a5236c9596d5ebc9d0bbfa3454e975005c751a9e15eb077a8dc8e236630a900ecf5bee7674b3139d2b82a76c5a1e9
DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
diff --git a/sys-devel/bmake/bmake-20210110.ebuild b/sys-devel/bmake/bmake-20210110.ebuild
new file mode 100644
index 00000000000..547f81f91f6
--- /dev/null
+++ b/sys-devel/bmake/bmake-20210110.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-20210110-tests.patch b/sys-devel/bmake/files/bmake-20210110-tests.patch
new file mode 100644
index 00000000000..1557ef85bef
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-20210110-tests.patch
@@ -0,0 +1,26 @@
+--- a/unit-tests/Makefile
++++ b/unit-tests/Makefile
+@@ -188,7 +188,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
+@@ -285,7 +284,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
+@@ -321,7 +319,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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/, sys-devel/bmake/files/
@ 2021-02-19 11:29 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-02-19 11:29 UTC (permalink / raw
To: gentoo-commits
commit: 416b8105de0b7c56a9ef5eaa780b4dea18ca92d0
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Fri Feb 19 11:29:41 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 11:29:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416b8105
sys-devel/bmake: Bump to 20210206
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-20210206.ebuild | 50 ++++++++++++++++++++++++
sys-devel/bmake/files/bmake-20210206-tests.patch | 18 +++++++++
3 files changed, 69 insertions(+)
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 3fa6bb71fb4..e5f2c33faaa 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,4 +1,5 @@
DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699 SHA512 a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507
DIST bmake-20201117.tar.gz 696371 BLAKE2B e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c SHA512 b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588
DIST bmake-20210110.tar.gz 735461 BLAKE2B e12882507bff3b47e4531519437e5e3c8fd0628edf8cbf7ca82b2e96745a767bead62f9a61bf3b99c1757803e29dfe757e0b2a48e2a2275a1ceaef1c63db9e24 SHA512 5b68b806a32a068e54d2a79796e99c189a6a5236c9596d5ebc9d0bbfa3454e975005c751a9e15eb077a8dc8e236630a900ecf5bee7674b3139d2b82a76c5a1e9
+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-20210206.ebuild b/sys-devel/bmake/bmake-20210206.ebuild
new file mode 100644
index 00000000000..547f81f91f6
--- /dev/null
+++ b/sys-devel/bmake/bmake-20210206.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-20210206-tests.patch b/sys-devel/bmake/files/bmake-20210206-tests.patch
new file mode 100644
index 00000000000..49e5f258e91
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-20210206-tests.patch
@@ -0,0 +1,18 @@
+--- a/unit-tests/Makefile
++++ b/unit-tests/Makefile
+@@ -191,7 +191,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
+@@ -290,7 +289,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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/, sys-devel/bmake/files/
@ 2021-02-19 11:29 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-02-19 11:29 UTC (permalink / raw
To: gentoo-commits
commit: 53a1e9183a1fa8bffcd696f9056cf0d07b3c95af
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Fri Feb 19 11:29:44 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 11:29:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53a1e918
sys-devel/bmake: Remove 20210110
Closes: https://github.com/gentoo/gentoo/pull/19526
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-20210110.ebuild | 50 ------------------------
sys-devel/bmake/files/bmake-20210110-tests.patch | 26 ------------
3 files changed, 77 deletions(-)
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index e5f2c33faaa..0a8bb4891aa 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,5 +1,4 @@
DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699 SHA512 a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507
DIST bmake-20201117.tar.gz 696371 BLAKE2B e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c SHA512 b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588
-DIST bmake-20210110.tar.gz 735461 BLAKE2B e12882507bff3b47e4531519437e5e3c8fd0628edf8cbf7ca82b2e96745a767bead62f9a61bf3b99c1757803e29dfe757e0b2a48e2a2275a1ceaef1c63db9e24 SHA512 5b68b806a32a068e54d2a79796e99c189a6a5236c9596d5ebc9d0bbfa3454e975005c751a9e15eb077a8dc8e236630a900ecf5bee7674b3139d2b82a76c5a1e9
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-20210110.ebuild b/sys-devel/bmake/bmake-20210110.ebuild
deleted file mode 100644
index 547f81f91f6..00000000000
--- a/sys-devel/bmake/bmake-20210110.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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-20210110-tests.patch b/sys-devel/bmake/files/bmake-20210110-tests.patch
deleted file mode 100644
index 1557ef85bef..00000000000
--- a/sys-devel/bmake/files/bmake-20210110-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/unit-tests/Makefile
-+++ b/unit-tests/Makefile
-@@ -188,7 +188,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
-@@ -285,7 +284,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
-@@ -321,7 +319,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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/, sys-devel/bmake/files/
@ 2021-02-19 11:47 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-02-19 11:47 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/, sys-devel/bmake/files/
@ 2021-03-23 14:44 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-03-23 14:44 UTC (permalink / raw
To: gentoo-commits
commit: a6413b2f09c01a845c1d1af3f20aa30de1ff27b4
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Tue Mar 23 14:44:30 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Mar 23 14:44:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6413b2f
sys-devel/bmake: Remove old 20201117
Closes: https://github.com/gentoo/gentoo/pull/20078
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-20201117.ebuild | 50 ------------------------
sys-devel/bmake/files/bmake-20201117-tests.patch | 34 ----------------
3 files changed, 85 deletions(-)
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index a4d150c0ab1..bd9a0d80f91 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,3 +1,2 @@
-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-20201117.ebuild b/sys-devel/bmake/bmake-20201117.ebuild
deleted file mode 100644
index 78a6f067ab3..00000000000
--- a/sys-devel/bmake/bmake-20201117.ebuild
+++ /dev/null
@@ -1,50 +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}"
-
-# 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-20201117-tests.patch b/sys-devel/bmake/files/bmake-20201117-tests.patch
deleted file mode 100644
index 185f45232e1..00000000000
--- a/sys-devel/bmake/files/bmake-20201117-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/unit-tests/Makefile
-+++ b/unit-tests/Makefile
-@@ -168,7 +168,6 @@
- TESTS+= envfirst
- TESTS+= error
- TESTS+= # escape # broken by reverting POSIX changes
--TESTS+= export
- TESTS+= export-all
- TESTS+= export-env
- TESTS+= export-variants
-@@ -255,7 +254,6 @@
- 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
-@@ -287,7 +285,6 @@
- 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
-@@ -300,7 +297,6 @@
- TESTS+= varmod-edge
- TESTS+= varmod-exclam-shell
- TESTS+= varmod-extension
--TESTS+= varmod-gmtime
- TESTS+= varmod-hash
- TESTS+= varmod-head
- TESTS+= varmod-ifelse
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/, sys-devel/bmake/files/
@ 2022-04-27 21:09 Jakov Smolić
0 siblings, 0 replies; 7+ messages in thread
From: Jakov Smolić @ 2022-04-27 21:09 UTC (permalink / raw
To: gentoo-commits
commit: 32fd2d327a841841a0aa1440994fd072eb7973b1
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 21:09:17 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 21:09:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fd2d32
sys-devel/bmake: Fix compilation warnings
Closes: https://bugs.gentoo.org/841362
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sys-devel/bmake/bmake-20220418.ebuild | 5 ++-
.../bmake/files/bmake-20220418-warnings.patch | 38 ++++++++++++++++++++++
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/sys-devel/bmake/bmake-20220418.ebuild b/sys-devel/bmake/bmake-20220418.ebuild
index 7b11aa7cebf4..5505e007c65a 100644
--- a/sys-devel/bmake/bmake-20220418.ebuild
+++ b/sys-devel/bmake/bmake-20220418.ebuild
@@ -17,7 +17,10 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
# Skip failing test (sandbox and csh)
-PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-20210206-tests.patch
+ "${FILESDIR}"/${PN}-20220418-warnings.patch
+)
src_prepare() {
default
diff --git a/sys-devel/bmake/files/bmake-20220418-warnings.patch b/sys-devel/bmake/files/bmake-20220418-warnings.patch
new file mode 100644
index 000000000000..1fccb91e95a3
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-20220418-warnings.patch
@@ -0,0 +1,38 @@
+# https://bugs.gentoo.org/841362
+#
+# Fix -Wimplicit-function-declaration and -Wunused-result warnings
+#
+# meta.c: In function ‘meta_name’:
+# meta.c:262:21: warning: implicit declaration of function ‘strlcpy’; did you mean ‘strncpy’? [-Wimplicit-function-declaration]
+# 262 | strlcpy(rp, tname_base, sizeof buf - (size_t)(rp - buf));
+# | ^~~~~~~
+# | strncpy
+#
+# meta.c: In function ‘meta_job_error’:
+# meta.c:774:5: warning: ignoring return value of ‘getcwd’ declared with attribute ‘warn_unused_result’ [-Wunused-result]
+# 774 | getcwd(cwd, sizeof cwd);
+# | ^~~~~~~~~~~~~~~~~~~~~~~
+
+--- a/meta.c
++++ b/meta.c
+@@ -106,6 +106,10 @@
+ char * stresep(char **, const char *, int);
+ #endif
+
++#if !defined(HAVE_STRLCPY)
++size_t strlcpy(char *, const char *, size_t);
++#endif
++
+ /*
+ * Filemon is a kernel module which snoops certain syscalls.
+ *
+@@ -769,7 +773,8 @@
+ }
+ if (gn != NULL)
+ Global_Set(".ERROR_TARGET", GNode_Path(gn));
+- getcwd(cwd, sizeof cwd);
++ if (getcwd(cwd, sizeof cwd) == NULL)
++ err(1, "Could not get current working directory");
+ Global_Set(".ERROR_CWD", cwd);
+ if (pbm->meta_fname[0] != '\0') {
+ Global_Set(".ERROR_META_FILE", pbm->meta_fname);
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-04-27 21:09 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-30 21:05 [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/, sys-devel/bmake/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-01-24 19:24 David Seifert
2021-02-19 11:29 David Seifert
2021-02-19 11:29 David Seifert
2021-02-19 11:47 David Seifert
2021-03-23 14:44 David Seifert
2022-04-27 21:09 Jakov Smolić
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox