[gentoo-commits] gentoo-x86 commit in dev-db/mysql-connector-c/files: conn-c-includes.patch openssl-cmake-detection.patch

[gentoo-commits] gentoo-x86 commit in dev-db/mysql-connector-c/files: conn-c-includes.patch openssl-cmake-detection.patch

[Brian Evans (grknight)]

grknight    15/07/17 16:53:19

  Added:                conn-c-includes.patch openssl-cmake-detection.patch
  Log:
  Initial commit of a new mysql client library only build intended as the new, primary library
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D1F781EFF9F4A3B6)

Revision  Changes    Path
1.1                  dev-db/mysql-connector-c/files/conn-c-includes.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-connector-c/files/conn-c-includes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-connector-c/files/conn-c-includes.patch?rev=1.1&content-type=text/plain

Index: conn-c-includes.patch
===================================================================
diff -aurN a/include/CMakeLists.txt b/include/CMakeLists.txt
--- a/include/CMakeLists.txt	2015-07-14 13:06:04.424091000 -0400
+++ b/include/CMakeLists.txt	2015-07-14 13:24:43.434091000 -0400
@@ -55,6 +55,11 @@
   byte_order_generic_x86.h
   little_endian.h
   big_endian.h
+  my_thread_local.h
+  thr_cond.h
+  thr_lock.h
+  thr_mutex.h
+  thr_rwlock.h
   ${HEADERS_GEN_CONFIGURE}
 )
 



1.1                  dev-db/mysql-connector-c/files/openssl-cmake-detection.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-connector-c/files/openssl-cmake-detection.patch?rev=1.1&content-type=text/plain

Index: openssl-cmake-detection.patch
===================================================================
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"