commit:     5c6f313be518087b4338480a852e8af3b6f4e0ec
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 06:33:40 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 19:14:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c6f313b

dev-libs/popt: fix build with lld-16

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/popt/popt-1.18.ebuild | 11 +++++++++--
 dev-libs/popt/popt-1.19.ebuild | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild
index 435dcfdc5e35..cbbaee017f57 100644
--- a/dev-libs/popt/popt-1.18.ebuild
+++ b/dev-libs/popt/popt-1.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib-minimal libtool
+inherit flag-o-matic multilib-minimal libtool toolchain-funcs
 
 DESCRIPTION="Parse Options - Command line parser"
 HOMEPAGE="https://github.com/rpm-software-management/popt";
@@ -25,6 +25,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+       # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+       # https://github.com/gentoo/gentoo/pull/28355
+       # mold needs this too but right now tc-ld-is-mold is also not available
+       if tc-ld-is-lld; then
+               append-ldflags -Wl,--undefined-version
+       fi
+
        local myeconfargs=(
                $(use_enable static-libs static)
                $(use_enable nls)

diff --git a/dev-libs/popt/popt-1.19.ebuild b/dev-libs/popt/popt-1.19.ebuild
index 483bb167bd28..bfabb9eff090 100644
--- a/dev-libs/popt/popt-1.19.ebuild
+++ b/dev-libs/popt/popt-1.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit multilib-minimal libtool
+inherit flag-o-matic multilib-minimal libtool toolchain-funcs
 
 DESCRIPTION="Parse Options - Command line parser"
 HOMEPAGE="https://github.com/rpm-software-management/popt";
@@ -29,6 +29,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+       # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+       # https://github.com/gentoo/gentoo/pull/28355
+       # mold needs this too but right now tc-ld-is-mold is also not available
+       if tc-ld-is-lld; then
+               append-ldflags -Wl,--undefined-version
+       fi
+
        local myeconfargs=(
                --disable-werror
                $(use_enable static-libs static)

Reply via email to