summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2019-11-12 09:08:03 -0500
committerBrian Evans <grknight@gentoo.org>2019-11-12 09:08:03 -0500
commit163c38d6672e4004836561f564437dc74d0b3e4c (patch)
tree535a292d89513d45a4523d4ce0e7d1ec65723c45 /dev-db/mariadb
parentapp-admin/rsyslog: bump to v8.1911.0 (diff)
downloadgentoo-163c38d6672e4004836561f564437dc74d0b3e4c.tar.gz
gentoo-163c38d6672e4004836561f564437dc74d0b3e4c.tar.bz2
gentoo-163c38d6672e4004836561f564437dc74d0b3e4c.zip
dev-db/mariadb: Fix galera_recovery script location
Closes: https://bugs.gentoo.org/699424 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Brian Evans <grknight@gentoo.org>
Diffstat (limited to 'dev-db/mariadb')
-rw-r--r--dev-db/mariadb/mariadb-10.3.20.ebuild4
-rw-r--r--dev-db/mariadb/mariadb-10.4.10.ebuild4
2 files changed, 8 insertions, 0 deletions
diff --git a/dev-db/mariadb/mariadb-10.3.20.ebuild b/dev-db/mariadb/mariadb-10.3.20.ebuild
index 35694b80036f..7fb13269e69d 100644
--- a/dev-db/mariadb/mariadb-10.3.20.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.20.ebuild
@@ -300,6 +300,10 @@ src_prepare() {
-e 's/ perror.1//' \
"${S}"/man/CMakeLists.txt || die
+ # Fix galera_recovery.sh script
+ sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+ scripts/galera_recovery.sh || die
+
cmake-utils_src_prepare
java-pkg-opt-2_src_prepare
}
diff --git a/dev-db/mariadb/mariadb-10.4.10.ebuild b/dev-db/mariadb/mariadb-10.4.10.ebuild
index 70ab47d3b626..c479a1ae70d5 100644
--- a/dev-db/mariadb/mariadb-10.4.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.10.ebuild
@@ -307,6 +307,10 @@ src_prepare() {
-e 's/ perror.1//' \
"${S}"/man/CMakeLists.txt || die
+ # Fix galera_recovery.sh script
+ sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+ scripts/galera_recovery.sh || die
+
sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
"${S}"/scripts/mysql_install_db.sh || die