commit: 88cfceb412c9c27b9b8fc9318cc38113478dd0db Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Thu Mar 1 00:46:58 2018 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Thu Mar 1 00:46:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88cfceb4
dev-db/mariadb: Fix building with abi_x86_32 and -server USE Closes: https://bugs.gentoo.org/649092 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-db/mariadb/mariadb-10.3.5_rc.ebuild | 39 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild index 40344139f09..1d5e58bace4 100644 --- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild +++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild @@ -266,6 +266,10 @@ src_prepare() { # There is no CMake flag, it simply checks for existance rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" + if ! use server; then + rm -r "${S}"/plugin/handler_socket || die + fi + cmake-utils_src_prepare } @@ -280,7 +284,11 @@ src_configure(){ # bug #283926, with GCC4.4, this is required to get correct behavior. append-flags -fno-strict-aliasing - multilib-minimal_src_configure + if use client-libs ; then + multilib-minimal_src_configure + else + multilib_src_configure + fi } multilib_src_configure() { @@ -482,14 +490,14 @@ multilib_src_configure() { } src_compile() { - multilib-minimal_src_compile + if use client-libs ; then + multilib-minimal_src_compile + else + multilib_src_compile + fi } multilib_src_compile() { - if ! multilib_is_native_abi && ! use client-libs ; then - return - fi - cmake-utils_src_compile } @@ -509,22 +517,18 @@ src_install() { # wrap the config scripts MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config /usr/bin/mysql_config ) + multilib-minimal_src_install + else + multilib_src_install + multilib_src_install_all fi - multilib-minimal_src_install } # Intentionally override eclass function multilib_src_install() { - if ! multilib_is_native_abi && ! use client-libs ; then - return - fi cmake-utils_src_install - if ! use client-libs ; then - return - fi - # Make sure the vars are correctly initialized mysql_init_vars @@ -622,12 +626,7 @@ multilib_src_install_all() { # FEATURES='test userpriv -usersandbox' \ # ebuild mariadb-X.X.XX.ebuild \ # digest clean package -multilib_src_test() { - - if ! multilib_is_native_abi ; then - einfo "Server tests not available on non-native abi". - return 0; - fi +src_test() { _disable_test() { local rawtestname reason
