* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/files/, sys-devel/bmake/
@ 2020-01-28 18:11 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2020-01-28 18:11 UTC (permalink / raw
To: gentoo-commits
commit: 6ef1c416ec17f87ae176b0a4ceb5d79591b2f70f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 18:11:19 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 18:11:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef1c416
sys-devel/bmake: Add 20181221 version
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-devel/bmake/Manifest | 2 +
sys-devel/bmake/bmake-20181221.ebuild | 44 ++++++++++++++++++++++
.../bmake-20181221-fix-gcc10-fno-common.patch | 22 +++++++++++
3 files changed, 68 insertions(+)
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index d3ee4e0739c..f7d01e9eda3 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,5 +1,7 @@
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 bmake-20181221.tar.gz 558806 BLAKE2B 57759a76f38431120db4d01770440b301b1170b6d24ce38930020df483010c5631e4276bd63b90204b2a01a3853c7146709b9b8b9cf1e7d958158f589269e955 SHA512 7824fb60e4ac8f9c5ab9f6a0d42720c5f3cb475851146bf8042625eb58bbd0dbacafce6969da2b51cdd6514e789a8f2a958e8b8538cd862eeea1b571da203e5b
DIST mk-20170301.tar.gz 93049 BLAKE2B cd105225e3b523bcacd52651d2253ea8147c317ac14a335c4fe711042da6119cd477a248649d8b10033d3913e41da33eaf57f26ea363ed8013b01fed7d672d7d SHA512 9727cb284339ec00caeccadd88b55d93027991d453e507c77575135efd789d77307c84137e83616df6643039f9f2449751d4796a87828224e5a8bf48bc0925a3
DIST mk-20170505.tar.gz 94846 BLAKE2B b32b809817d4e50b5254c106cac0f7ad33dbadaaa84cd4454faa3193fc0c1193fe5d11de67d4571bd83e3bdf2295940d452a22c1ff83fe0ef3b18ec85b512b56 SHA512 8a9303612a80afdc3c74be8176cab2c04c10c91b1dd30245645cd5441928f388e291de8fe65efd4341c1bf787d8bafaae8f02018c5353ab2916a69cb2db7334c
+DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
diff --git a/sys-devel/bmake/bmake-20181221.ebuild b/sys-devel/bmake/bmake-20181221.ebuild
new file mode 100644
index 00000000000..c7915e164c0
--- /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 00000000000..affd94daefe
--- /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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/files/, sys-devel/bmake/
@ 2021-01-12 9:37 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-01-12 9:37 UTC (permalink / raw
To: gentoo-commits
commit: 3f92f42f888fb0705c4679a089998a604bf2ca58
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Tue Jan 12 09:36:52 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> 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 <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/files/, sys-devel/bmake/
@ 2021-01-24 19:24 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-01-24 19:24 UTC (permalink / raw
To: gentoo-commits
commit: b869000494496a2d7ee97bb77fb8fa60c8cad52d
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Jan 24 19:23:53 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 19:23:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8690004
sys-devel/bmake: Remove 20201222
Closes: https://github.com/gentoo/gentoo/pull/19194
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-20201222.ebuild | 50 ------------------------
sys-devel/bmake/files/bmake-20201222-tests.patch | 26 ------------
3 files changed, 77 deletions(-)
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 10644e10ac6..3fa6bb71fb4 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-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-20201222.ebuild b/sys-devel/bmake/bmake-20201222.ebuild
deleted file mode 100644
index 547f81f91f6..00000000000
--- a/sys-devel/bmake/bmake-20201222.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-20201222-tests.patch b/sys-devel/bmake/files/bmake-20201222-tests.patch
deleted file mode 100644
index 9a5efb79246..00000000000
--- a/sys-devel/bmake/files/bmake-20201222-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/files/, sys-devel/bmake/
@ 2021-03-26 11:42 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-03-26 11:42 UTC (permalink / raw
To: gentoo-commits
commit: 4cf4b5fe7683285d3e8d46b08f004fba85907865
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Fri Mar 26 11:42:08 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 11:42:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf4b5fe
sys-devel/bmake: Patch the default lib.mk rule
* Bmake ships default mk rules, and lib.mk containes default LD_shared variable which in turn creates naming problems when we build libraries on Linux, so we have to fix LD_shared to prevent that
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../bmake/{bmake-20210206.ebuild => bmake-20210206-r1.ebuild} | 6 ++++++
sys-devel/bmake/files/bmake-20210206-lib-mk.patch | 11 +++++++++++
2 files changed, 17 insertions(+)
diff --git a/sys-devel/bmake/bmake-20210206.ebuild b/sys-devel/bmake/bmake-20210206-r1.ebuild
similarity index 92%
rename from sys-devel/bmake/bmake-20210206.ebuild
rename to sys-devel/bmake/bmake-20210206-r1.ebuild
index 9c585254add..3b3e54fcda2 100644
--- a/sys-devel/bmake/bmake-20210206.ebuild
+++ b/sys-devel/bmake/bmake-20210206-r1.ebuild
@@ -20,6 +20,12 @@ S="${WORKDIR}/${PN}"
# Skip failing test (sandbox and csh)
PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+src_prepare() {
+ default
+ cd "${WORKDIR}" || die
+ eapply "${FILESDIR}"/${P}-lib-mk.patch
+}
+
src_configure() {
econf \
--with-mksrc=../mk \
diff --git a/sys-devel/bmake/files/bmake-20210206-lib-mk.patch b/sys-devel/bmake/files/bmake-20210206-lib-mk.patch
new file mode 100644
index 00000000000..5f860b6f15a
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-20210206-lib-mk.patch
@@ -0,0 +1,11 @@
+--- a/mk/lib.mk
++++ b/mk/lib.mk
+@@ -170,7 +170,7 @@ LD_solib= lib${LIB}_pic.a
+ .elif ${TARGET_OSNAME} == "Linux"
+ SHLIB_LD = ${CC}
+ # this is ambiguous of course
+-LD_shared=-shared -Wl,"-soname lib${LIB}.so.${SHLIB_MAJOR}"
++LD_shared=-shared -Wl,-soname,lib${LIB}.so.${SHLIB_MAJOR}
+ LD_solib= -Wl,--whole-archive lib${LIB}_pic.a -Wl,--no-whole-archive
+ .if ${COMPILER_TYPE} == "gcc"
+ # Linux uses GNU ld, which is a multi-pass linker
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/files/, sys-devel/bmake/
@ 2021-04-03 12:31 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-04-03 12:31 UTC (permalink / raw
To: gentoo-commits
commit: 142bb6ee2cfdcc77f29da1d70622de18952fef70
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Apr 3 12:30:38 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr 3 12:30:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142bb6ee
sys-devel/bmake: Bump mk files to 20210330, include additional .mk fixes
* Respect LDFLAGS
* Do not strip prog binaries when installing them
Closes: https://bugs.gentoo.org/779340
Closes: https://bugs.gentoo.org/778458
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-20210314-r1.ebuild | 55 ++++++++++++++++++
.../bmake/files/bmake-20210314-mk-fixes.patch | 66 ++++++++++++++++++++++
3 files changed, 122 insertions(+)
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 1660c7bd6fd..4f09dd97003 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,3 +1,4 @@
DIST bmake-20210206.tar.gz 740065 BLAKE2B 2482b980ad4e4aac4292e0244020eeb3699148d84b0f493865a8317673eddb20ed48219f1319c490c6a88c6f1c50a44bd95af5de43f5853876bd10c1aef9b4bd SHA512 abda3aadd49abfe0e7801f4c37539a9172c3bb2d6ed542e0dec5b6177a799774a4b513041ff6167409c69ac6af35f506b1d6e585694259192a65a8575c232839
DIST bmake-20210314.tar.gz 749343 BLAKE2B 765b06577d8b06924627de7c2551e4fa25bdf533f2ce96db09a63af01d965e2bc29001e2c07df98a15d72b3c57a11e99974df82b9ec12257c9340baf563c3faf SHA512 d27c3787102d32ccd541909aaf76083ff9d2f704b938ba64d234c5d29d2e7dea320e99bbee53d3594aa830ced59d512d8701487ec5b0c277339e705d6e64f97d
DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
+DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
diff --git a/sys-devel/bmake/bmake-20210314-r1.ebuild b/sys-devel/bmake/bmake-20210314-r1.ebuild
new file mode 100644
index 00000000000..b68c5fb3598
--- /dev/null
+++ b/sys-devel/bmake/bmake-20210314-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MK_VER=20210330
+
+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"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Skip failing test (sandbox and csh)
+PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch )
+
+src_prepare() {
+ default
+ cd "${WORKDIR}" || die
+ eapply "${FILESDIR}"/${P}-mk-fixes.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-20210314-mk-fixes.patch b/sys-devel/bmake/files/bmake-20210314-mk-fixes.patch
new file mode 100644
index 00000000000..6dd935863be
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-20210314-mk-fixes.patch
@@ -0,0 +1,66 @@
+# https://bugs.gentoo.org/779340
+# https://bugs.gentoo.org/778458
+# - Fix incorrect linking of shared libraries
+# - Respect LDFLAGS
+# - Do not strip prog binaries
+--- a/mk/lib.mk
++++ b/mk/lib.mk
+@@ -170,7 +170,7 @@ LD_solib= lib${LIB}_pic.a
+ .elif ${TARGET_OSNAME} == "Linux"
+ SHLIB_LD = ${CC}
+ # this is ambiguous of course
+-LD_shared=-shared -Wl,"-soname lib${LIB}.so.${SHLIB_MAJOR}"
++LD_shared=-shared -Wl,-soname,lib${LIB}.so.${SHLIB_MAJOR}
+ LD_solib= -Wl,--whole-archive lib${LIB}_pic.a -Wl,--no-whole-archive
+ .if ${COMPILER_TYPE} == "gcc"
+ # Linux uses GNU ld, which is a multi-pass linker
+@@ -455,11 +455,11 @@ lib${LIB}.${LD_so}: ${SOLIB} ${DPADD}
+ --whole-archive ${SOLIB} --no-whole-archive ${SHLIB_LDADD} \
+ ${SHLIB_LDENDFILE}
+ .else
+- ${SHLIB_LD} ${LD_x} ${LD_shared} \
++ ${SHLIB_LD} ${LD_x} ${LD_shared} ${LDFLAGS} \
+ -o ${.TARGET} ${SOLIB} ${SHLIB_LDADD}
+ .endif
+ .else
+- ${SHLIB_LD} -o ${.TARGET} ${LD_shared} ${LD_solib} ${DLLIB} ${SHLIB_LDADD}
++ ${SHLIB_LD} -o ${.TARGET} ${LD_shared} ${LDFLAGS} ${LD_solib} ${DLLIB} ${SHLIB_LDADD}
+ .endif
+ .endif
+ .if !empty(SHLIB_LINKS)
+--- a/mk/prog.mk
++++ b/mk/prog.mk
+@@ -178,7 +178,7 @@ proginstall:
+ .if defined(PROG)
+ [ -d ${DESTDIR}${BINDIR} ] || \
+ ${INSTALL} -d ${PROG_INSTALL_OWN} -m 775 ${DESTDIR}${BINDIR}
+- ${INSTALL} ${COPY} ${STRIP_FLAG} ${PROG_INSTALL_OWN} -m ${BINMODE} \
++ ${INSTALL} ${COPY} ${PROG_INSTALL_OWN} -m ${BINMODE} \
+ ${PROG} ${DESTDIR}${BINDIR}/${PROG_NAME}
+ .endif
+ .if defined(HIDEGAME)
+--- a/mk/sys/Linux.mk
++++ b/mk/sys/Linux.mk
+@@ -19,12 +19,13 @@ NEED_SOLINKS ?=yes
+ AR ?= ar
+ ARFLAGS ?= rl
+ RANLIB ?= ranlib
++LDFLAGS ?=
+
+ AS ?= as
+ AFLAGS=
+ COMPILE.s ?= ${AS} ${AFLAGS}
+ LINK.s ?= ${CC} ${AFLAGS} ${LDFLAGS}
+-COMPILE.S ?= ${CC} ${AFLAGS} ${CPPFLAGS} -c
++COMPILE.S ?= ${CC} ${AFLAGS} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -c
+ LINK.S ?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
+ .if exists(/usr/local/bin/gcc)
+ CC ?= gcc -pipe
+@@ -65,7 +66,6 @@ LFLAGS=
+ LEX.l ?= ${LEX} ${LFLAGS}
+
+ LD ?= ld
+-LDFLAGS=
+
+ LINT ?= lint
+ LINTFLAGS ?= -chapbx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/files/, sys-devel/bmake/
@ 2021-05-27 21:13 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-05-27 21:13 UTC (permalink / raw
To: gentoo-commits
commit: 6a0a168f9422e8ec5e6043c46da9c355d703e2a9
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu May 27 21:12:00 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu May 27 21:12:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a0a168f
sys-devel/bmake: Remove old 20210314-r1
Closes: https://github.com/gentoo/gentoo/pull/20723
Closes: https://github.com/gentoo/gentoo/pull/21008
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-20210314-r1.ebuild | 55 -----------------------
sys-devel/bmake/files/bmake-20210206-lib-mk.patch | 11 -----
3 files changed, 67 deletions(-)
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 134345967b9..4872b6c45fe 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,3 +1,2 @@
-DIST bmake-20210314.tar.gz 749343 BLAKE2B 765b06577d8b06924627de7c2551e4fa25bdf533f2ce96db09a63af01d965e2bc29001e2c07df98a15d72b3c57a11e99974df82b9ec12257c9340baf563c3faf SHA512 d27c3787102d32ccd541909aaf76083ff9d2f704b938ba64d234c5d29d2e7dea320e99bbee53d3594aa830ced59d512d8701487ec5b0c277339e705d6e64f97d
DIST bmake-20210420.tar.gz 755281 BLAKE2B fe98dc5d0c5a11aecf45b160cfe5b69ef49e56a973823e84ec1f607023aa94d66cd87bc3f31fc340dc86eae0a6e87ca2a71b8367f3e9bb1a9eae8626d13a80ea SHA512 3bb603965c149e4f6bee4afff9710921e943bd1faaf5d142418a5f7a0752416e094b6a0f0dfc998bf6bedc391f668162856a51167e34b6f2ad2a0a498c96ed35
DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
diff --git a/sys-devel/bmake/bmake-20210314-r1.ebuild b/sys-devel/bmake/bmake-20210314-r1.ebuild
deleted file mode 100644
index d8e7d457313..00000000000
--- a/sys-devel/bmake/bmake-20210314-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MK_VER=20210330
-
-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"
-S="${WORKDIR}/${PN}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-
-# Skip failing test (sandbox and csh)
-PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch )
-
-src_prepare() {
- default
- cd "${WORKDIR}" || die
- eapply "${FILESDIR}"/${P}-mk-fixes.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-lib-mk.patch b/sys-devel/bmake/files/bmake-20210206-lib-mk.patch
deleted file mode 100644
index 5f860b6f15a..00000000000
--- a/sys-devel/bmake/files/bmake-20210206-lib-mk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mk/lib.mk
-+++ b/mk/lib.mk
-@@ -170,7 +170,7 @@ LD_solib= lib${LIB}_pic.a
- .elif ${TARGET_OSNAME} == "Linux"
- SHLIB_LD = ${CC}
- # this is ambiguous of course
--LD_shared=-shared -Wl,"-soname lib${LIB}.so.${SHLIB_MAJOR}"
-+LD_shared=-shared -Wl,-soname,lib${LIB}.so.${SHLIB_MAJOR}
- LD_solib= -Wl,--whole-archive lib${LIB}_pic.a -Wl,--no-whole-archive
- .if ${COMPILER_TYPE} == "gcc"
- # Linux uses GNU ld, which is a multi-pass linker
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-27 21:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-26 11:42 [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/files/, sys-devel/bmake/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-05-27 21:13 David Seifert
2021-04-03 12:31 David Seifert
2021-01-24 19:24 David Seifert
2021-01-12 9:37 David Seifert
2020-01-28 18:11 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox