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 4D9201396D9 for ; Fri, 3 Nov 2017 12:54:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5880BE0C7A; Fri, 3 Nov 2017 12:54:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 26AAEE0C7A for ; Fri, 3 Nov 2017 12:54:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 83E5A3417A3 for ; Fri, 3 Nov 2017 12:54:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB868937E for ; Fri, 3 Nov 2017 12:54:46 +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: <1509713538.cbecd699292619d1eaddec9a8efd7b9cbb7de92b.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql/metadata.xml dev-db/mysql/mysql-5.6.38.ebuild X-VCS-Directories: dev-db/mysql/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: cbecd699292619d1eaddec9a8efd7b9cbb7de92b X-VCS-Branch: master Date: Fri, 3 Nov 2017 12:54:46 +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: 1e93a295-b7c3-4f3d-962b-f0f08c14d868 X-Archives-Hash: fea687da4fca70bea8758dd7222154a5 commit: cbecd699292619d1eaddec9a8efd7b9cbb7de92b Author: Brian Evans gentoo org> AuthorDate: Fri Nov 3 12:52:18 2017 +0000 Commit: Brian Evans gentoo org> CommitDate: Fri Nov 3 12:52:18 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbecd699 dev-db/mysql: Add numa USE wrt bug 635282 Closes: https://bugs.gentoo.org/635282 Package-Manager: Portage-2.3.13, Repoman-2.3.4 dev-db/mysql/metadata.xml | 1 + dev-db/mysql/mysql-5.6.38.ebuild | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml index 8e45aa661e8..83ee85b777f 100644 --- a/dev-db/mysql/metadata.xml +++ b/dev-db/mysql/metadata.xml @@ -21,6 +21,7 @@ dev-db/mariadb Enable SSL connections and crypto functions using dev-libs/openssl Raise the max index per table limit from 64 to 128 Install client programs only, no server + Enable NUMA support using sys-process/numactl (NUMA kernel support is also required) Add support for statement profiling (requires USE=community). Build the server program Build support for profiling and tracing using dev-util/systemtap diff --git a/dev-db/mysql/mysql-5.6.38.ebuild b/dev-db/mysql/mysql-5.6.38.ebuild index 050b1e092c8..01d0263e17b 100644 --- a/dev-db/mysql/mysql-5.6.38.ebuild +++ b/dev-db/mysql/mysql-5.6.38.ebuild @@ -13,12 +13,12 @@ CMAKE_MAKEFILE_GENERATOR=emake inherit mysql-multilib-r1 # only to make repoman happy. it is really set in the eclass -IUSE="$IUSE" +IUSE="$IUSE numa" # REMEMBER: also update eclass/mysql*.eclass before committing! KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) numa? ( sys-process/numactl )" RDEPEND="${RDEPEND}" MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" @@ -38,10 +38,6 @@ PATCHES=( # If you want to add a single patch, copy the ebuild to an overlay # and create your own mysql-extras tarball, looking at 000_index.txt -# validate_password plugin uses exceptions when it shouldn't yet (until 5.7) -# disable until we see what happens with it -MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 ) - src_prepare() { mysql-multilib-r1_src_prepare if use libressl ; then @@ -50,6 +46,13 @@ src_prepare() { fi } +src_configure() { + # validate_password plugin uses exceptions when it shouldn't yet (until 5.7) + # disable until we see what happens with it + local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 -DWITH_NUMA=$(usex numa ON OFF) ) + mysql-multilib-r1_src_configure +} + # Official test instructions: # USE='server embedded extraengine perl openssl static-libs' \ # FEATURES='test userpriv -usersandbox' \