diff options
| author | Brian Evans <grknight@gentoo.org> | 2018-08-09 19:41:02 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2018-08-09 19:41:02 -0400 |
| commit | ec67cfa11324254e5b67b07c3c34bfc1481e26de (patch) | |
| tree | 9df0be785a84544a003a90e0af52e436067daa3b /dev-db/mariadb/mariadb-10.0.35-r2.ebuild | |
| parent | d3b44736c3f103c21126c370c6d331aff2537f4e (diff) | |
| download | gentoo-ec67cfa11324254e5b67b07c3c34bfc1481e26de.tar.gz gentoo-ec67cfa11324254e5b67b07c3c34bfc1481e26de.tar.bz2 gentoo-ec67cfa11324254e5b67b07c3c34bfc1481e26de.zip | |
dev-db/mariadb: Fix galera and initial install
Install my_print_defaults to libexec so that galera
and mysql_install_db work correctly with the --mysqld option
which is MariaDB specific
Closes: https://bugs.gentoo.org/662566
Package-Manager: Portage-2.3.45, Repoman-2.3.10
Diffstat (limited to 'dev-db/mariadb/mariadb-10.0.35-r2.ebuild')
| -rw-r--r-- | dev-db/mariadb/mariadb-10.0.35-r2.ebuild | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/dev-db/mariadb/mariadb-10.0.35-r2.ebuild b/dev-db/mariadb/mariadb-10.0.35-r2.ebuild index 23c9b0f225db..7757768000cb 100644 --- a/dev-db/mariadb/mariadb-10.0.35-r2.ebuild +++ b/dev-db/mariadb/mariadb-10.0.35-r2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" -MY_EXTRAS_VER="20180515-1334Z" +MY_EXTRAS_VER="20180809-1700Z" SUBSLOT="18" JAVA_PKG_OPT_USE="jdbc" @@ -211,7 +211,6 @@ src_prepare() { echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die } - java-pkg-opt-2_src_prepare if use tcmalloc; then echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die fi @@ -249,6 +248,7 @@ src_prepare() { fi cmake-utils_src_prepare + java-pkg-opt-2_src_prepare } src_configure(){ @@ -458,6 +458,10 @@ src_install() { for script in "${S%/}"/scripts/mysql* ; do [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}" done + # Manually install supporting files that conflict with other packages + # but are needed for galera and initial installation + exeinto /usr/libexec/mariadb + doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror" fi #Remove mytop if perl is not selected |