Date: Wed, 24 Aug 2016 18:56:34 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420816 - in head/databases: mysql57-client/files mysql57-server mysql57-server/files Message-ID: <201608241856.u7OIuYlq067657@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Wed Aug 24 18:56:34 2016 New Revision: 420816 URL: https://svnweb.freebsd.org/changeset/ports/420816 Log: databases/mysql57-server: Fix build with LibreSSL - Fix building when OPENSSL_VERSION_NUMBER == 2 - Switch USE_OPENSSL to USES= ssl PR: 211770 Submitted by: Markus Kohlmeyer <rootservice@gmail.com> Reported by: Markus Kohlmeyer <rootservice@gmail.com> Approved by: Mahdi Mokhtari <mokhi64@gmail.com> MFH: 2016Q3 Added: head/databases/mysql57-client/files/patch-cmake_ssl.cmake (contents, props changed) head/databases/mysql57-server/files/patch-cmake_ssl.cmake (contents, props changed) Modified: head/databases/mysql57-server/Makefile Added: head/databases/mysql57-client/files/patch-cmake_ssl.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-cmake_ssl.cmake Wed Aug 24 18:56:34 2016 (r420816) @@ -0,0 +1,15 @@ +--- cmake/ssl.cmake.orig 2016-08-12 10:55:07 UTC ++++ cmake/ssl.cmake +@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_MAJOR_VERSION STREQUAL "1" + ) + SET(OPENSSL_FOUND TRUE) ++ ELSEIF(OPENSSL_INCLUDE_DIR AND ++ OPENSSL_LIBRARY AND ++ CRYPTO_LIBRARY AND ++ OPENSSL_MAJOR_VERSION STREQUAL "2" ++ ) ++ SET(OPENSSL_FOUND TRUE) + ELSE() + SET(OPENSSL_FOUND FALSE) + ENDIF() Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Wed Aug 24 18:51:02 2016 (r420815) +++ head/databases/mysql57-server/Makefile Wed Aug 24 18:56:34 2016 (r420816) @@ -17,9 +17,9 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} SLAVEDIRS= databases/mysql57-client -USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib cpe libedit localbase perl5 shebangfix +USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib \ + cpe libedit localbase perl5 shebangfix ssl -USE_OPENSSL= yes USE_PERL5= run MY_DBDIR= /var/db/mysql Added: head/databases/mysql57-server/files/patch-cmake_ssl.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-server/files/patch-cmake_ssl.cmake Wed Aug 24 18:56:34 2016 (r420816) @@ -0,0 +1,15 @@ +--- cmake/ssl.cmake.orig 2016-08-12 10:55:07 UTC ++++ cmake/ssl.cmake +@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_MAJOR_VERSION STREQUAL "1" + ) + SET(OPENSSL_FOUND TRUE) ++ ELSEIF(OPENSSL_INCLUDE_DIR AND ++ OPENSSL_LIBRARY AND ++ CRYPTO_LIBRARY AND ++ OPENSSL_MAJOR_VERSION STREQUAL "2" ++ ) ++ SET(OPENSSL_FOUND TRUE) + ELSE() + SET(OPENSSL_FOUND FALSE) + ENDIF()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608241856.u7OIuYlq067657>