diff options
Diffstat (limited to 'dev-db/mariadb/mariadb-10.1.34.ebuild')
| -rw-r--r-- | dev-db/mariadb/mariadb-10.1.34.ebuild | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/dev-db/mariadb/mariadb-10.1.34.ebuild b/dev-db/mariadb/mariadb-10.1.34.ebuild index 214896029dfe..036920e712cc 100644 --- a/dev-db/mariadb/mariadb-10.1.34.ebuild +++ b/dev-db/mariadb/mariadb-10.1.34.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" -MY_EXTRAS_VER="20180621-0218Z" +MY_EXTRAS_VER="20180809-1700Z" SUBSLOT="18" JAVA_PKG_OPT_USE="jdbc" @@ -234,7 +234,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 @@ -269,6 +268,7 @@ src_prepare() { _disable_engine example cmake-utils_src_prepare + java-pkg-opt-2_src_prepare } src_configure(){ @@ -491,6 +491,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 |