commit: 4a86e974111fde9c163c780a638c5f32025e517f
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 30 21:37:04 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Jan 30 21:37:04 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4a86e974
Fix OpenSSL detection
---
dev-db/mysql-connector-c/files/openssl-cmake-detection.patch | 12 ++++++++++++
dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild | 5 +++++
2 files changed, 17 insertions(+)
diff --git a/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch
b/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch
new file mode 100644
index 0000000..3a5f53e
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch
@@ -0,0 +1,12 @@
+diff -aurN a/cmake/ssl.cmake b/cmake/ssl.cmake
+--- a/cmake/ssl.cmake 2014-11-21 00:39:51.000000000 -0500
++++ b/cmake/ssl.cmake 2015-01-27 08:45:36.771744344 -0500
+@@ -166,7 +166,7 @@
+ # Encoded as MNNFFPPS: major minor fix patch status
+ FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
+ OPENSSL_VERSION_NUMBER
+- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
++ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+ )
+ STRING(REGEX REPLACE
+ "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
index d850290..7e1f1fd 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild
@@ -39,6 +39,11 @@ DEPEND="${CDEPEND}
DOCS=( README Docs/ChangeLog )
+src_prepare() {
+ epatch "${FILESDIR}/openssl-cmake-detection.patch"
+ epatch_user
+}
+
multilib_src_configure() {
mycmakeargs+=(
-DINSTALL_LAYOUT=RPM
