From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- sys-devel/bmake/Manifest | 9 ++-- sys-devel/bmake/bmake-20200318.ebuild | 49 --------------------- sys-devel/bmake/bmake-20210110.ebuild | 50 ---------------------- sys-devel/bmake/bmake-20210206.ebuild | 50 ++++++++++++++++++++++ .../bmake-20181221-fix-gcc10-fno-common.patch | 22 ---------- sys-devel/bmake/files/bmake-20210110-tests.patch | 26 ----------- sys-devel/bmake/files/bmake-20210206-tests.patch | 18 ++++++++ 7 files changed, 71 insertions(+), 153 deletions(-) delete mode 100644 sys-devel/bmake/bmake-20200318.ebuild delete mode 100644 sys-devel/bmake/bmake-20210110.ebuild create mode 100644 sys-devel/bmake/bmake-20210206.ebuild delete mode 100644 sys-devel/bmake/files/bmake-20181221-fix-gcc10-fno-common.patch delete mode 100644 sys-devel/bmake/files/bmake-20210110-tests.patch create mode 100644 sys-devel/bmake/files/bmake-20210206-tests.patch (limited to 'sys-devel/bmake') diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest index b8ca9a1abe76..be4f6fe51768 100644 --- a/sys-devel/bmake/Manifest +++ b/sys-devel/bmake/Manifest @@ -1,11 +1,8 @@ -AUX bmake-20181221-fix-gcc10-fno-common.patch 575 BLAKE2B f8e767c442683332b258cb4df3cad965cc2cb2903ce404e6f0f923c6ff1135e3e51d28e3b1855fe0ac27e5db839ae117236ead9cf8fed3bef6706dff9754e56f SHA512 d6986497844239b7c67e721b76387c391a7bf71a7122dfa54aadbada6add5bf3d810aea0f8f119d47c76445266f90a2cc39bef23b398cb3ee396de6cefa0020b AUX bmake-20201117-tests.patch 796 BLAKE2B e30d5584e9fa36203ed54bd969b174a082f188b191ce0c3990a6b798ea938d71d14a208f7e5e1963cc74ddb85548aec20ba0b63c059c6b042e7cd04298455fc8 SHA512 270bcc2f4353e0aeba97215f92e6cf51e858b24c44d761b1d588d66604c61471b9a69e259900ad68ea71b0efe92942524763a39e4be081e24e246790f92bad78 -AUX bmake-20210110-tests.patch 670 BLAKE2B 0b3f10933d5608781b231a0e198839e5aa6ab1dbcb2509412746bdfe04a92f000be1fd999b320128d9eaf5ffba0a75578db72de3c77510913a55bcfbfa26676c SHA512 0c7ac61f93dcdef6af48ac03e8789a04960c1884166ef40dfcd06d0df73bf7d89b238c2325c1ce40e5e3c1bf0420ff673d042a3d469e31b88b7d227e97a52ace -DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699 SHA512 a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507 +AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359ecb0e5b5c746447b9a0e9d2dff188f6f0d45225dd07d1226a86297f0c9ba8b8be7587039f2cc7ceaab4bde61f570 SHA512 3d855d54b64e2871ad8ccd494939c92a6bca2bec61f186e907a9b6b8b4f51b4ff63fcacbb8b6d44cef33a39c6ba2bed6c1fdd30d7ad65ad03d1d659781c420fe 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 -EBUILD bmake-20200318.ebuild 1137 BLAKE2B 5ceb9e88fec798df6afebae8dd6534a95ee5a977369a52bd9dde1525c471a0fd838cd667e3c5c1d7ce3a29f6e9fc449c1cf011fe75cdbfd5a397410f99cf3860 SHA512 aab466bfc237621ba3f5f5840b93c4fef6b42464f0c302380dad7d3caee053ec7b6510136188ffed382a8017cb44f41e36155637e1d6d51c1ba0bd15faaaaccf EBUILD bmake-20201117.ebuild 1152 BLAKE2B 643222e719b1bc152f930c85c026a19077645e767d1b1256d72882beb1b271348c944d54e5433aa96f3364fd6204e341d2854f2b93dc0f6ed40d487cd588b475 SHA512 b06d919e2d9adff7d7a39498fd1a8e2fd231af83dcac3a358e751cdda1e47e247957465e785245ffd56d0cf1ddc5015c9e23a5be28d5d5a4855d8bb8b713f49f -EBUILD bmake-20210110.ebuild 1153 BLAKE2B 1cb5132e060ae65c0afe2a4b14740172ae2f43be23d1ca93b60001fcd0901d227ad8170d5f11cd593bbcaa80f90375f79fdab656b89876bb5d3370add35b7fea SHA512 6d1eef0c8c9371350ccb28b95c11518f0413c9224e993bd94eb6bf1fa97a51da9662e85acaa353134ddb898d37710910a12a93b1223a2b5268d31f3fb241b20e +EBUILD bmake-20210206.ebuild 1153 BLAKE2B 1cb5132e060ae65c0afe2a4b14740172ae2f43be23d1ca93b60001fcd0901d227ad8170d5f11cd593bbcaa80f90375f79fdab656b89876bb5d3370add35b7fea SHA512 6d1eef0c8c9371350ccb28b95c11518f0413c9224e993bd94eb6bf1fa97a51da9662e85acaa353134ddb898d37710910a12a93b1223a2b5268d31f3fb241b20e MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787 diff --git a/sys-devel/bmake/bmake-20200318.ebuild b/sys-devel/bmake/bmake-20200318.ebuild deleted file mode 100644 index b0c8b6fb0d9b..000000000000 --- 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/bmake-20210110.ebuild b/sys-devel/bmake/bmake-20210110.ebuild deleted file mode 100644 index 547f81f91f68..000000000000 --- 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/bmake-20210206.ebuild b/sys-devel/bmake/bmake-20210206.ebuild new file mode 100644 index 000000000000..547f81f91f68 --- /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-20181221-fix-gcc10-fno-common.patch b/sys-devel/bmake/files/bmake-20181221-fix-gcc10-fno-common.patch deleted file mode 100644 index affd94daefe7..000000000000 --- 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 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 1557ef85bef9..000000000000 --- 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 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 000000000000..49e5f258e91a --- /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 -- cgit v1.2.3