dev-db/mariadb: Fix galera_recovery script location
authorBrian Evans <grknight@gentoo.org>
Tue, 12 Nov 2019 14:08:03 +0000 (09:08 -0500)
committerBrian Evans <grknight@gentoo.org>
Tue, 12 Nov 2019 14:08:03 +0000 (09:08 -0500)
Closes: https://bugs.gentoo.org/699424
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Brian Evans <grknight@gentoo.org>
dev-db/mariadb/mariadb-10.3.20.ebuild
dev-db/mariadb/mariadb-10.4.10.ebuild

index 35694b80036fb4a4854293aa519b52d251309bc2..7fb13269e69d3bc9c2c555c80d63513f95dbbd62 100644 (file)
@@ -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
 }
index 70ab47d3b626a744363b3e80b0213a7711a8ce49..c479a1ae70d56a4a41cdd4713d69a51e7fd254c1 100644 (file)
@@ -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