diff options
| author | Z. Liu <zhixu.liu@gmail.com> | 2024-09-02 16:26:20 +0800 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-12-03 08:07:51 +0000 |
| commit | 505a3759e913c5a1bafc87b4967d68099b97c925 (patch) | |
| tree | 6c9f673d7889fdfd493bd8439d2250d5991f40d0 /dev-db/mariadb/mariadb-10.6.14.ebuild | |
| parent | ca403eb6e8e98b2b0e98590303d1976c9e008cf2 (diff) | |
| download | gentoo-505a3759e913c5a1bafc87b4967d68099b97c925.tar.gz gentoo-505a3759e913c5a1bafc87b4967d68099b97c925.tar.bz2 gentoo-505a3759e913c5a1bafc87b4967d68099b97c925.zip | |
dev-db/mariadb: fix build failed
1. <=10.6.17 add patch related with libxml2 2.12 from upstream
see https://github.com/MariaDB/server/commit/cae18632aea530eb73a9f15ee4fd0d924e01a8d3
2. if systemtap build w/o dtrace-symlink, build will failed w/:
DTRACE-NOTFOUND: command not found
Bug: https://bugs.gentoo.org/917537
Closes: https://bugs.gentoo.org/943306
Signed-off-by: Z. Liu <zhixu.liu@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38377
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-db/mariadb/mariadb-10.6.14.ebuild')
| -rw-r--r-- | dev-db/mariadb/mariadb-10.6.14.ebuild | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/dev-db/mariadb/mariadb-10.6.14.ebuild b/dev-db/mariadb/mariadb-10.6.14.ebuild index 25e4c8272981..96dee3339e82 100644 --- a/dev-db/mariadb/mariadb-10.6.14.ebuild +++ b/dev-db/mariadb/mariadb-10.6.14.ebuild @@ -219,6 +219,7 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch eapply "${FILESDIR}"/${PN}-10.6.11-include.patch eapply "${FILESDIR}"/${PN}-10.6.12-gcc-13.patch + eapply "${FILESDIR}"/${PN}-10.6.17-libxml-2.12.patch eapply_user @@ -362,6 +363,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) |