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

["Sam James" <sam@gentoo.org>]

commit:     a75e6bb902f21f884eddfda9efebf7d8ca6f04a9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 04:51:50 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 04:52:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a75e6bb9

dev-db/mariadb-connector-c: filter LTO

Bug: https://jira.mariadb.org/browse/MDEV-11914
Bug: https://jira.mariadb.org/browse/MDEV-25633
Bug: https://bugs.gentoo.org/855233
Closes: https://bugs.gentoo.org/855236
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild | 13 ++++++++++---
 dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild | 13 ++++++++++---
 dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild  | 13 ++++++++++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
index 0f94f5ae5fd0..455985c30d27 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 x86"
 fi
 
-inherit cmake-multilib toolchain-funcs
+inherit cmake-multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://mariadb.org/"
@@ -64,10 +64,17 @@ src_prepare() {
 	cmake_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
 	# mariadb cannot use ld.gold, bug #508724
 	tc-ld-disable-gold
 
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
+
+	cmake-multilib_src_configure
+}
+
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DWITH_EXTERNAL_ZLIB=ON
 		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild
index 2778d1261848..3ebe51ce18fc 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
 fi
 
-inherit cmake-multilib toolchain-funcs
+inherit cmake-multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://mariadb.org/"
@@ -66,10 +66,17 @@ src_prepare() {
 	cmake_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
 	# mariadb cannot use ld.gold, bug #508724
 	tc-ld-disable-gold
 
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
+
+	cmake-multilib_src_configure
+}
+
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DWITH_EXTERNAL_ZLIB=ON
 		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index 62a90589ade5..416f40ada533 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
 fi
 
-inherit cmake-multilib toolchain-funcs
+inherit cmake-multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://mariadb.org/"
@@ -64,10 +64,17 @@ src_prepare() {
 	cmake_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
 	# mariadb cannot use ld.gold, bug #508724
 	tc-ld-disable-gold
 
+	# bug #855233 (MDEV-11914, MDEV-25633) at least
+	filter-lto
+
+	cmake-multilib_src_configure
+}
+
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DWITH_EXTERNAL_ZLIB=ON
 		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)