commit: 043dee4ade0478b996a33822060afb344449be67
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 18:10:29 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> 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 <grknight <AT> 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' \
