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

[Petr Vaněk]

commit:     d5c7cf94083ab203cc3f1d97196d760bbafd4127
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 14 21:58:41 2025 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Fri Feb 14 22:02:21 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c7cf94

dev-db/mariadb: port systemtap w/o dtrace-symlink fix

We missed to port the fix to mariadb-10.6.{15,20,21} which also fail to
build if systemtap is build w/o dtrace-symlink. The fix is ported from
commit 505a3759e913 ("dev-db/mariadb: fix build failed").

Bug: https://bugs.gentoo.org/943306
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 dev-db/mariadb/mariadb-10.6.15.ebuild | 8 +++++++-
 dev-db/mariadb/mariadb-10.6.20.ebuild | 6 ++++++
 dev-db/mariadb/mariadb-10.6.21.ebuild | 6 ++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/dev-db/mariadb/mariadb-10.6.15.ebuild 
b/dev-db/mariadb/mariadb-10.6.15.ebuild
index da35494bb8d6..5d186317f426 100644
--- a/dev-db/mariadb/mariadb-10.6.15.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -365,6 +365,12 @@ src_configure() {
                mycmakeargs+=( -DWITH_SSL=bundled )
        fi
 
+       if use systemtap && has_version 
"dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+               mycmakeargs+=(
+                       -DDTRACE="${BROOT}"/usr/bin/stap-dtrace
+               )
+       fi
+
        # bfd.h is only used starting with 10.1 and can be controlled by 
NOT_FOR_DISTRIBUTION
        mycmakeargs+=(
                -DWITH_READLINE=$(usex bindist 1 0)

diff --git a/dev-db/mariadb/mariadb-10.6.20.ebuild 
b/dev-db/mariadb/mariadb-10.6.20.ebuild
index b2c78c893b35..2c9127e81001 100644
--- a/dev-db/mariadb/mariadb-10.6.20.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.20.ebuild
@@ -368,6 +368,12 @@ src_configure() {
                mycmakeargs+=( -DWITH_SSL=bundled )
        fi
 
+       if use systemtap && has_version 
"dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+               mycmakeargs+=(
+                       -DDTRACE="${BROOT}"/usr/bin/stap-dtrace
+               )
+       fi
+
        # bfd.h is only used starting with 10.1 and can be controlled by 
NOT_FOR_DISTRIBUTION
        mycmakeargs+=(
                -DWITH_READLINE=$(usex bindist 1 0)

diff --git a/dev-db/mariadb/mariadb-10.6.21.ebuild 
b/dev-db/mariadb/mariadb-10.6.21.ebuild
index d5cad1321758..ae19b19755a9 100644
--- a/dev-db/mariadb/mariadb-10.6.21.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.21.ebuild
@@ -368,6 +368,12 @@ src_configure() {
                mycmakeargs+=( -DWITH_SSL=bundled )
        fi
 
+       if use systemtap && has_version 
"dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+               mycmakeargs+=(
+                       -DDTRACE="${BROOT}"/usr/bin/stap-dtrace
+               )
+       fi
+
        # bfd.h is only used starting with 10.1 and can be controlled by 
NOT_FOR_DISTRIBUTION
        mycmakeargs+=(
                -DWITH_READLINE=$(usex bindist 1 0)