diff options
| author | Petr Vaněk <arkamar@gentoo.org> | 2025-02-14 18:15:42 +0100 |
|---|---|---|
| committer | Petr Vaněk <arkamar@gentoo.org> | 2025-02-15 22:27:27 +0100 |
| commit | 506b9c0380f5a89acd33d68aa388c5e4f6c16638 (patch) | |
| tree | 9087f95afe4ab73e91c54493a30f2137b2b56898 /dev-db/mariadb/mariadb-10.6.15.ebuild | |
| parent | 2ec6af082c31763a886f37235425846a288e17f4 (diff) | |
| download | gentoo-506b9c0380f5a89acd33d68aa388c5e4f6c16638.tar.gz gentoo-506b9c0380f5a89acd33d68aa388c5e4f6c16638.tar.bz2 gentoo-506b9c0380f5a89acd33d68aa388c5e4f6c16638.zip | |
dev-db/mariadb: fix USE=columnstore with >=dev-libs/boost-1.85
Boost 1.85 dropped some deprecated code from filesystem module, which is
still used in MariaDB columnstore. However, older Boost versions are no
longer available in ::gentoo, which effectively makes the MariaDB
unbuildable if USE=columnstore is set.
This fix applies a patch with port to Boost 1.85 to all available
mariadb-10* ebuilds. The patch was submitted to upstream [1]. It was
also necessary to apply C++17 fix, which was backported from commit [2].
MariaDB currently installs bundled libthrift.so with USE=columnstore,
which collides with dev-libs/thrift. This problem is solved with a
conditional weak blocker for now.
[1] https://github.com/mariadb-corporation/mariadb-columnstore-engine/pull/3407
[2] https://github.com/mariadb-corporation/mariadb-columnstore-engine/commit/1973168e03d90d8c6da590df2f31982dd400ea0b
Bug: https://bugs.gentoo.org/861770
Bug: https://bugs.gentoo.org/932735
Signed-off-by: Petr Vaněk <arkamar@gentoo.org>
Diffstat (limited to 'dev-db/mariadb/mariadb-10.6.15.ebuild')
| -rw-r--r-- | dev-db/mariadb/mariadb-10.6.15.ebuild | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/dev-db/mariadb/mariadb-10.6.15.ebuild b/dev-db/mariadb/mariadb-10.6.15.ebuild index 5d186317f426..77f2113e1848 100644 --- a/dev-db/mariadb/mariadb-10.6.15.ebuild +++ b/dev-db/mariadb/mariadb-10.6.15.ebuild @@ -11,7 +11,8 @@ inherit systemd flag-o-matic prefix toolchain-funcs \ HOMEPAGE="https://mariadb.org/" SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz - https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.13-patches-01.tar.xz" + https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.13-patches-01.tar.xz + https://dev.gentoo.org/~arkamar/distfiles/${PN}-10.6-columnstore-with-boost-1.85.patch.xz" DESCRIPTION="An enhanced, drop-in replacement for MySQL" LICENSE="GPL-2 LGPL-2.1+" @@ -115,7 +116,10 @@ RDEPEND="${COMMON_DEPEND} !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql ) server? ( - columnstore? ( dev-db/mariadb-connector-c ) + columnstore? ( + dev-db/mariadb-connector-c + !dev-libs/thrift + ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) galera? ( sys-apps/iproute2 @@ -219,6 +223,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 "${WORKDIR}"/${PN}-10.6-columnstore-with-boost-1.85.patch eapply_user |