From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 208A01382C5 for ; Fri, 26 Mar 2021 11:42:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67BDEE07D7; Fri, 26 Mar 2021 11:42:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47ECFE07D7 for ; Fri, 26 Mar 2021 11:42:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC43A33BF02 for ; Fri, 26 Mar 2021 11:42:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2621F5CE for ; Fri, 26 Mar 2021 11:42:25 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1616758928.4cf4b5fe7683285d3e8d46b08f004fba85907865.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/bmake/files/, sys-devel/bmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/bmake/bmake-20210206-r1.ebuild sys-devel/bmake/bmake-20210206.ebuild sys-devel/bmake/files/bmake-20210206-lib-mk.patch X-VCS-Directories: sys-devel/bmake/ sys-devel/bmake/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 4cf4b5fe7683285d3e8d46b08f004fba85907865 X-VCS-Branch: master Date: Fri, 26 Mar 2021 11:42:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1d2992e9-47f2-42cf-bf1f-16b0497f720c X-Archives-Hash: b7af546c6b3c3031a8a685628d54d70c commit: 4cf4b5fe7683285d3e8d46b08f004fba85907865 Author: Jakov Smolic sartura hr> AuthorDate: Fri Mar 26 11:42:08 2021 +0000 Commit: David Seifert gentoo 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 sartura.hr> Signed-off-by: David Seifert 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