From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B0B5D138334 for ; Wed, 14 Nov 2018 15:41:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 014A7E0934; Wed, 14 Nov 2018 15:41:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B7DB4E0934 for ; Wed, 14 Nov 2018 15:41:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D849D335C5A for ; Wed, 14 Nov 2018 15:41:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C3FF245A for ; Wed, 14 Nov 2018 15:41:23 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1542210015.7fe8a7def353a51345f9cfecf0685f23af840719.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mariadb/mariadb-10.2.19.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 7fe8a7def353a51345f9cfecf0685f23af840719 X-VCS-Branch: master Date: Wed, 14 Nov 2018 15:41:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 57845f1f-41c7-42bb-a20f-526fbacc7364 X-Archives-Hash: 74672d39da9969d583254a68b85f1f12 commit: 7fe8a7def353a51345f9cfecf0685f23af840719 Author: Brian Evans gentoo org> AuthorDate: Wed Nov 14 15:40:15 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed Nov 14 15:40:15 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fe8a7de dev-db/mariadb: Fix collisions with mariadb-connector-c Also speed up building by removing unnecessary plugins when they will not be used Closes: https://bugs.gentoo.org/671116 Signed-off-by: Brian Evans gentoo.org> dev-db/mariadb/mariadb-10.2.19.ebuild | 47 +++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.2.19.ebuild b/dev-db/mariadb/mariadb-10.2.19.ebuild index 5fdac38352f..da01e09871b 100644 --- a/dev-db/mariadb/mariadb-10.2.19.ebuild +++ b/dev-db/mariadb/mariadb-10.2.19.ebuild @@ -39,7 +39,6 @@ RESTRICT="!bindist? ( bindist ) libressl? ( test )" REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) - !server? ( !extraengine ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )" @@ -260,6 +259,13 @@ src_unpack() { } src_prepare() { + _disable_plugin() { + echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die + } + _disable_engine() { + echo > "${S%/}/storage/${1}/CMakeLists.txt" || die + } + if use tcmalloc; then echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" fi @@ -269,12 +275,36 @@ src_prepare() { sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die - # Remove the bundled groonga - # There is no CMake flag, it simply checks for existance - rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" + local plugin + local server_plugins=( handler_socket auth_socket feedback metadata_lock_info + locale_info qc_info server_audit sql_errlog ) + local test_plugins=( audit_null auth_examples daemon_example fulltext + debug_key_management example_key_management ) + if ! use server; then # These plugins are for the server + for plugin in "${server_plugins[@]}" ; do + _disable_plugin "${plugin}" + done + fi + + if ! use test; then # These plugins are only used during testing + for plugin in "${test_plugins[@]}" ; do + _disable_plugin "${plugin}" + done + _disable_engine test_sql_discovery + fi + + _disable_engine example - if ! use server; then - rm -r "${S}"/plugin/handler_socket || die + if ! use oqgraph ; then # avoids extra library checks + _disable_engine oqgraph + fi + + if use mroonga ; then + # Remove the bundled groonga + # There is no CMake flag, it simply checks for existance + rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga" + else + _disable_engine mroonga fi cmake-utils_src_prepare @@ -350,6 +380,9 @@ multilib_src_configure() { -DWITH_EXTERNAL_ZLIB=YES -DSUFFIX_INSTALL_DIR="" -DWITH_UNITTEST=OFF + -DCLIENT_PLUGIN_DIALOG=OFF + -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF + -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC ) if use test ; then mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test ) @@ -358,7 +391,7 @@ multilib_src_configure() { fi if ! use yassl ; then - mycmakeargs+=( -DWITH_SSL=system ) + mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC ) else mycmakeargs+=( -DWITH_SSL=bundled ) fi