From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 87AA013888F for ; Mon, 19 Oct 2015 18:14:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87840E0807; Mon, 19 Oct 2015 18:14:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A161E0807 for ; Mon, 19 Oct 2015 18:14:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC58C33BEBE for ; Mon, 19 Oct 2015 18:14:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1DF4C132D for ; Mon, 19 Oct 2015 18:13:57 +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: <1445278229.043dee4ade0478b996a33822060afb344449be67.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mysql/mysql-5.6.27-r1.ebuild dev-db/mysql/mysql-5.6.27.ebuild dev-db/mysql/mysql-5.7.7_rc.ebuild dev-db/mysql/mysql-5.7.8_rc.ebuild X-VCS-Directories: dev-db/mysql/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 043dee4ade0478b996a33822060afb344449be67 X-VCS-Branch: master Date: Mon, 19 Oct 2015 18:13:57 +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: 60dca90c-4e16-4d53-9ffe-c4859e3be73e X-Archives-Hash: 18971d87ca850e5e9a382ee6966701d5 commit: 043dee4ade0478b996a33822060afb344449be67 Author: Brian Evans gentoo org> AuthorDate: Mon Oct 19 18:10:29 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Mon Oct 19 18:10:29 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=043dee4a dev-db/mysql: patch cmake file for libressl version check Signed-off-by: Brian Evans gentoo.org> dev-db/mysql/mysql-5.6.27-r1.ebuild | 8 ++++++++ dev-db/mysql/mysql-5.6.27.ebuild | 8 ++++++++ dev-db/mysql/mysql-5.7.7_rc.ebuild | 8 ++++++++ dev-db/mysql/mysql-5.7.8_rc.ebuild | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/dev-db/mysql/mysql-5.6.27-r1.ebuild b/dev-db/mysql/mysql-5.6.27-r1.ebuild index 365c7de..4ff5c0d 100644 --- a/dev-db/mysql/mysql-5.6.27-r1.ebuild +++ b/dev-db/mysql/mysql-5.6.27-r1.ebuild @@ -31,6 +31,14 @@ RDEPEND="${RDEPEND}" # disable until we see what happens with it MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1" +src_prepare() { + mysql-multilib_src_prepare + if use libressl ; then + sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ + "${S}/cmake/ssl.cmake" || die + fi +} + # Official test instructions: # USE='server embedded extraengine perl ssl static-libs community' \ # FEATURES='test userpriv -usersandbox' \ diff --git a/dev-db/mysql/mysql-5.6.27.ebuild b/dev-db/mysql/mysql-5.6.27.ebuild index e10fde2..98a209a 100644 --- a/dev-db/mysql/mysql-5.6.27.ebuild +++ b/dev-db/mysql/mysql-5.6.27.ebuild @@ -30,6 +30,14 @@ RDEPEND="${RDEPEND}" # disable until we see what happens with it MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1" +src_prepare() { + mysql-multilib_src_prepare + if use libressl ; then + sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ + "${S}/cmake/ssl.cmake" || die + fi +} + # Official test instructions: # USE='embedded extraengine perl ssl static-libs community' \ # FEATURES='test userpriv -usersandbox' \ diff --git a/dev-db/mysql/mysql-5.7.7_rc.ebuild b/dev-db/mysql/mysql-5.7.7_rc.ebuild index 3d70597..9239998 100644 --- a/dev-db/mysql/mysql-5.7.7_rc.ebuild +++ b/dev-db/mysql/mysql-5.7.7_rc.ebuild @@ -29,6 +29,14 @@ RDEPEND="${RDEPEND}" # 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 +src_prepare() { + mysql-multilib_src_prepare + if use libressl ; then + sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ + "${S}/cmake/ssl.cmake" || die + fi +} + # Official test instructions: # USE='-cluster embedded extraengine perl ssl static-libs community' \ # FEATURES='test userpriv -usersandbox' \ diff --git a/dev-db/mysql/mysql-5.7.8_rc.ebuild b/dev-db/mysql/mysql-5.7.8_rc.ebuild index a335105..d0111cd 100644 --- a/dev-db/mysql/mysql-5.7.8_rc.ebuild +++ b/dev-db/mysql/mysql-5.7.8_rc.ebuild @@ -29,6 +29,14 @@ RDEPEND="${RDEPEND}" # 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 +src_prepare() { + mysql-multilib_src_prepare + if use libressl ; then + sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ + "${S}/cmake/ssl.cmake" || die + fi +} + # Official test instructions: # USE='-cluster embedded extraengine perl ssl static-libs community' \ # FEATURES='test userpriv -usersandbox' \