[csw-devel] SF.net SVN: gar:[16596] csw/mgar/pkg/mysql5/branches/mysql-5.5.x

[wahwah at users.sourceforge.net]

Revision: 16596
          http://gar.svn.sourceforge.net/gar/?rev=16596&view=rev
Author:   wahwah
Date:     2011-12-22 16:45:12 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.5.x: work around the SSL discovery problem http://bugs.mysql.com/bug.php?id=61619

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-I-HATE-CMAKE.patch

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2011-12-22 13:47:49 UTC (rev 16595)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2011-12-22 16:45:12 UTC (rev 16596)
@@ -75,6 +75,8 @@
 # PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch
 # The configuration phase failed (?)
 # PATCHFILES += 0002-stop-cmake-from-messing-with-cflags.patch
+# PATCHFILES += 0005-I-HATE-CMAKE.patch
+PATCHFILES += 0003-I-HATE-CMAKE.patch
 
 PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER)
 PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
@@ -160,6 +162,12 @@
 # EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 # EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 
+# A workaround for OpenSSL
+# http://www.cmake.org/pipermail/cmake/2011-December/048220.html
+# EXTRA_CFLAGS = -I$(includedir)
+# EXTRA_CXXFLAGS = -I$(includedir)
+# It doesn't work. cmake filters them out or something.
+
 MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/
 DISTFILES  = mysql-$(VERSION).tar.gz
 DISTFILES += csw$(NAME).tpl
@@ -222,6 +230,10 @@
 # CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
 # CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)"
 CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix)
+# CMAKE_ARGS += -DOPENSSL_SSL_LIBRARIES=$(libdir)/$(MM_LIBDIR)/libssl.so
+# CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/$(MM_LIBDIR)/libcrypto.so
+CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
+CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
 
 # CMAKE_LIBRARY_PATH = $(libdir)
 # EXTRA_CONFIGURE_EXPORTS += CMAKE_LIBRARY_PATH
@@ -319,7 +331,7 @@
 
 CONFIGURE_SCRIPTS = custom
 
-EXTRA_PKG_CONFIG_DIRS = $(FILEDIR)/64
+# EXTRA_PKG_CONFIG_DIRS = $(FILEDIR)/64
 
 include gar/category.mk
 

Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-I-HATE-CMAKE.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-I-HATE-CMAKE.patch	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-I-HATE-CMAKE.patch	2011-12-22 16:45:12 UTC (rev 16596)
@@ -0,0 +1,36 @@
+From da58cb8a9a33720c3c187fcebfd28cefc3886c26 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 22 Dec 2011 17:05:40 +0100
+Subject: [PATCH] I HATE CMAKE
+
+For being so opaque.
+
+Fix stolen from:
+http://bugs.mysql.com/bug.php?id=61619
+---
+ cmake/ssl.cmake |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
+index 9b16bf0..97dc7d2 100644
+--- a/cmake/ssl.cmake
++++ b/cmake/ssl.cmake
+@@ -64,11 +64,14 @@ MACRO (MYSQL_CHECK_SSL)
+     MYSQL_USE_BUNDLED_SSL()
+   ELSEIF(WITH_SSL STREQUAL "system" OR WITH_SSL STREQUAL "yes")
+     # Check for system library
+-    SET(OPENSSL_FIND_QUIETLY TRUE)
++    # SET(OPENSSL_FIND_QUIETLY TRUE)
+     INCLUDE(FindOpenSSL)
++    MESSAGE(STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}")
++    MESSAGE(STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}")
+     FIND_LIBRARY(CRYPTO_LIBRARY crypto)
+     MARK_AS_ADVANCED(CRYPTO_LIBRARY)
+     INCLUDE(CheckSymbolExists)
++    SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+     CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" 
+                         HAVE_SHA512_DIGEST_LENGTH)
+     IF(OPENSSL_FOUND AND CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH)
+-- 
+1.7.6.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.