[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

[Petr Vaněk]

commit:     6e1c35c7c9cbd38c2bc173fe436573b589c5f4b3
Author:     David C. Manuelda <StormByte <AT> gmail <DOT> com>
AuthorDate: Tue Nov 12 23:29:46 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 08:23:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e1c35c7

dev-db/mariadb: Only force bfd linker when gold linker is used

By silently forcing BFD build failures might happen if users have
special LLD link flags in LDFLAGS and there is no reason to force
BFD when using LLD (only when using Gold linker)

Fixes: 995a68e3bb9c ("dev-db/mariadb: add 10.6.20")
Fixes: 4ef76f37461d ("dev-db/mariadb: add 10.11.10")
Fixes: a1354b25554e ("dev-db/mariadb: add 11.4.4")
Signed-off-by: David C. Manuelda <StormByte <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39295
See-also: https://github.com/gentoo/gentoo/pull/39289
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 dev-db/mariadb/mariadb-10.11.10.ebuild | 2 +-
 dev-db/mariadb/mariadb-10.6.20.ebuild  | 2 +-
 dev-db/mariadb/mariadb-11.4.4.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-db/mariadb/mariadb-10.11.10.ebuild 
b/dev-db/mariadb/mariadb-10.11.10.ebuild
index cfd89ef4adc2..69f5d541f7b8 100644
--- a/dev-db/mariadb/mariadb-10.11.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.11.10.ebuild
@@ -281,7 +281,7 @@ src_configure() {
        # bug #855233 (MDEV-11914, MDEV-25633) at least
        filter-lto
        # bug 508724 mariadb cannot use ld.gold
-       tc-ld-force-bfd
+       tc-ld-is-gold && tc-ld-force-bfd
        # Bug #114895, bug #110149
        filter-flags "-O" "-O[01]"
 

diff --git a/dev-db/mariadb/mariadb-10.6.20.ebuild 
b/dev-db/mariadb/mariadb-10.6.20.ebuild
index e0431ed54311..26bf82323a42 100644
--- a/dev-db/mariadb/mariadb-10.6.20.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.20.ebuild
@@ -292,7 +292,7 @@ src_configure() {
        # bug #855233 (MDEV-11914, MDEV-25633) at least
        filter-lto
        # bug 508724 mariadb cannot use ld.gold
-       tc-ld-force-bfd
+       tc-ld-is-gold && tc-ld-force-bfd
        # Bug #114895, bug #110149
        filter-flags "-O" "-O[01]"
 

diff --git a/dev-db/mariadb/mariadb-11.4.4.ebuild 
b/dev-db/mariadb/mariadb-11.4.4.ebuild
index 406b61c8dab2..1e2e3278d2dd 100644
--- a/dev-db/mariadb/mariadb-11.4.4.ebuild
+++ b/dev-db/mariadb/mariadb-11.4.4.ebuild
@@ -281,7 +281,7 @@ src_configure() {
        # bug #855233 (MDEV-11914, MDEV-25633) at least
        filter-lto
        # bug 508724 mariadb cannot use ld.gold
-       tc-ld-force-bfd
+       tc-ld-is-gold && tc-ld-force-bfd
        # Bug #114895, bug #110149
        filter-flags "-O" "-O[01]"