From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- sys-devel/bmake/Manifest | 14 +++--- sys-devel/bmake/bmake-20170421.ebuild | 50 ---------------------- sys-devel/bmake/bmake-20170510.ebuild | 50 ---------------------- sys-devel/bmake/bmake-20170812.ebuild | 50 ---------------------- sys-devel/bmake/bmake-20181221.ebuild | 44 +++++++++++++++++++ .../bmake-20181221-fix-gcc10-fno-common.patch | 22 ++++++++++ sys-devel/bmake/metadata.xml | 5 ++- 7 files changed, 75 insertions(+), 160 deletions(-) delete mode 100644 sys-devel/bmake/bmake-20170421.ebuild delete mode 100644 sys-devel/bmake/bmake-20170510.ebuild delete mode 100644 sys-devel/bmake/bmake-20170812.ebuild create mode 100644 sys-devel/bmake/bmake-20181221.ebuild create mode 100644 sys-devel/bmake/files/bmake-20181221-fix-gcc10-fno-common.patch (limited to 'sys-devel/bmake') diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest index b2fab150e4f6..96f589135541 100644 --- a/sys-devel/bmake/Manifest +++ b/sys-devel/bmake/Manifest @@ -1,9 +1,5 @@ -DIST bmake-20170421.tar.gz 550626 BLAKE2B 79d3e88784cbdaf0dec8240f42543c3d11225235887c0ac7f8ed55960e6de120d196d0e865bbecd334df240971b418182b05fbe60f038f3f810d264f8fcfb850 SHA512 f984dd7697ff74455690d9f0b6a355e3bd3de7545eb93def82aeaaf1899b5316a83e36502ffdd64ef53ad2b28fbfad61cfaee17b8ec29a1f0dd6640c13b4f04f -DIST bmake-20170510.tar.gz 552370 BLAKE2B c06263d378423a79bda8d6564e6e1bb111f3b192d79718119333429933a38840137db0e2334a7a3980bf385a448fa114bee4868e27fc732b4cc554bd99e31c13 SHA512 55300e3e375047a400912e62821a179b2a3dfdf61e39c3991fe236c5b63816f854ebb50f759a0a8a938af4b84f00eaa9cc2e172288287c019ecadfc0b359a1f6 -DIST bmake-20170812.tar.gz 554613 BLAKE2B e2e93142f12921d73dea9e2c5a92d83d02528a40d7ea1ced5ce41ce4e709f58a4728878de8d21a96add36aa68d769a3061757b0287dea1543ada93e214e0206c SHA512 2345d24967796950ba9c661e65228223da51c6f22da34ad2dbc5069e0ca56445902685f9da5cfd0f2594f6261ae778d3621670bd80fc8f840d970b6fd8f185f4 -DIST mk-20170301.tar.gz 93049 BLAKE2B cd105225e3b523bcacd52651d2253ea8147c317ac14a335c4fe711042da6119cd477a248649d8b10033d3913e41da33eaf57f26ea363ed8013b01fed7d672d7d SHA512 9727cb284339ec00caeccadd88b55d93027991d453e507c77575135efd789d77307c84137e83616df6643039f9f2449751d4796a87828224e5a8bf48bc0925a3 -DIST mk-20170505.tar.gz 94846 BLAKE2B b32b809817d4e50b5254c106cac0f7ad33dbadaaa84cd4454faa3193fc0c1193fe5d11de67d4571bd83e3bdf2295940d452a22c1ff83fe0ef3b18ec85b512b56 SHA512 8a9303612a80afdc3c74be8176cab2c04c10c91b1dd30245645cd5441928f388e291de8fe65efd4341c1bf787d8bafaae8f02018c5353ab2916a69cb2db7334c -EBUILD bmake-20170421.ebuild 1173 BLAKE2B 01a1249daa9bbb8c6c435f15f9cb51ef5b04d7056abb084200023502b526e52d678261216ec7c052714711b52f9235ce7007e833a14923a9a7ba0768189baf4c SHA512 8e78c74d16e580531a0a8fb94119f3e7ed7c898d13dc2b7345047a1f8df301a4f3462fcdcaf7e6de74d98c61ba7ee724bd51ab7e311ef3136412bd5fc37f58d2 -EBUILD bmake-20170510.ebuild 1173 BLAKE2B 18c8e432d30732f95027a4109c7fcf1410002942891d5c7ddfae1cdbf987cd4d12ce8d35fcf65e509af37fd155e6716a624af46a9ea8f23861200208d33ea43e SHA512 63372986eb42ce9651225d89bbdee10958f3e9fa81472554223aedb407adeed210874a53fa3322f5a48ab38d16887b9118dcb3637a5a694c9c0e5ddc47a326cf -EBUILD bmake-20170812.ebuild 1173 BLAKE2B 18c8e432d30732f95027a4109c7fcf1410002942891d5c7ddfae1cdbf987cd4d12ce8d35fcf65e509af37fd155e6716a624af46a9ea8f23861200208d33ea43e SHA512 63372986eb42ce9651225d89bbdee10958f3e9fa81472554223aedb407adeed210874a53fa3322f5a48ab38d16887b9118dcb3637a5a694c9c0e5ddc47a326cf -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 +AUX bmake-20181221-fix-gcc10-fno-common.patch 575 BLAKE2B f8e767c442683332b258cb4df3cad965cc2cb2903ce404e6f0f923c6ff1135e3e51d28e3b1855fe0ac27e5db839ae117236ead9cf8fed3bef6706dff9754e56f SHA512 d6986497844239b7c67e721b76387c391a7bf71a7122dfa54aadbada6add5bf3d810aea0f8f119d47c76445266f90a2cc39bef23b398cb3ee396de6cefa0020b +DIST bmake-20181221.tar.gz 558806 BLAKE2B 57759a76f38431120db4d01770440b301b1170b6d24ce38930020df483010c5631e4276bd63b90204b2a01a3853c7146709b9b8b9cf1e7d958158f589269e955 SHA512 7824fb60e4ac8f9c5ab9f6a0d42720c5f3cb475851146bf8042625eb58bbd0dbacafce6969da2b51cdd6514e789a8f2a958e8b8538cd862eeea1b571da203e5b +DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861 +EBUILD bmake-20181221.ebuild 979 BLAKE2B 4d5c1d11111526ce986d3e42c8490085d515af4bf190987d9e5119cfcfdcc2922c9f322c06495e1c47ba5fa491044b7e2df11d2eb43b27e63c9389f01fc3a749 SHA512 90fb29c32f1d981bb803f815bf864333ed7ada9643588c1658e33174ea844f4c1de41df0a0d7ef82a0aed0f1d8cf2a9586aed40714c6b9ece49c4d83c737993d +MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787 diff --git a/sys-devel/bmake/bmake-20170421.ebuild b/sys-devel/bmake/bmake-20170421.ebuild deleted file mode 100644 index e3738bfbdce7..000000000000 --- a/sys-devel/bmake/bmake-20170421.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -MK_VER=20170301 -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}" - -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 - LC_ALL=C env -u A ${S}/bmake -r -m . > test.out 2>&1 \ - || die "tests compilation failed" - sed -i \ - -e "s:${S}/::g" \ - -e "s:bmake\\[.\\]:make:g" \ - -e "s:unit-tests/::g" \ - test.out || die "Fixing values failed" - diff -u test.exp test.out - [[ $(diff -u test.exp test.out |wc -l) -gt 0 ]] && die "tests differ" -} - -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-20170510.ebuild b/sys-devel/bmake/bmake-20170510.ebuild deleted file mode 100644 index 03ffd36338d0..000000000000 --- a/sys-devel/bmake/bmake-20170510.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -MK_VER=20170505 -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}" - -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 - LC_ALL=C env -u A ${S}/bmake -r -m . > test.out 2>&1 \ - || die "tests compilation failed" - sed -i \ - -e "s:${S}/::g" \ - -e "s:bmake\\[.\\]:make:g" \ - -e "s:unit-tests/::g" \ - test.out || die "Fixing values failed" - diff -u test.exp test.out - [[ $(diff -u test.exp test.out |wc -l) -gt 0 ]] && die "tests differ" -} - -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-20170812.ebuild b/sys-devel/bmake/bmake-20170812.ebuild deleted file mode 100644 index 03ffd36338d0..000000000000 --- a/sys-devel/bmake/bmake-20170812.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -MK_VER=20170505 -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}" - -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 - LC_ALL=C env -u A ${S}/bmake -r -m . > test.out 2>&1 \ - || die "tests compilation failed" - sed -i \ - -e "s:${S}/::g" \ - -e "s:bmake\\[.\\]:make:g" \ - -e "s:unit-tests/::g" \ - test.out || die "Fixing values failed" - diff -u test.exp test.out - [[ $(diff -u test.exp test.out |wc -l) -gt 0 ]] && die "tests differ" -} - -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-20181221.ebuild b/sys-devel/bmake/bmake-20181221.ebuild new file mode 100644 index 000000000000..c7915e164c03 --- /dev/null +++ b/sys-devel/bmake/bmake-20181221.ebuild @@ -0,0 +1,44 @@ +# 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 + LC_ALL=C env -u A "${S}"/bmake -r -m all || 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 new file mode 100644 index 000000000000..affd94daefe7 --- /dev/null +++ b/sys-devel/bmake/files/bmake-20181221-fix-gcc10-fno-common.patch @@ -0,0 +1,22 @@ +--- 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/metadata.xml b/sys-devel/bmake/metadata.xml index 6f49eba8f496..70f78a5392df 100644 --- a/sys-devel/bmake/metadata.xml +++ b/sys-devel/bmake/metadata.xml @@ -1,5 +1,8 @@ - + + soap@gentoo.org + David Seifert + -- cgit v1.2.3