Date: Sun, 11 Sep 2016 09:00:17 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r421809 - in branches/2016Q3/databases: mysql57-client/files mysql57-server mysql57-server/files Message-ID: <201609110900.u8B90HPa092647@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sun Sep 11 09:00:17 2016 New Revision: 421809 URL: https://svnweb.freebsd.org/changeset/ports/421809 Log: MFH: r420816 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> Approved by: ports-secteam (junovitch) Added: branches/2016Q3/databases/mysql57-client/files/patch-cmake_ssl.cmake - copied unchanged from r420816, head/databases/mysql57-client/files/patch-cmake_ssl.cmake branches/2016Q3/databases/mysql57-server/files/patch-cmake_ssl.cmake - copied unchanged from r420816, head/databases/mysql57-server/files/patch-cmake_ssl.cmake Modified: branches/2016Q3/databases/mysql57-server/Makefile Directory Properties: branches/2016Q3/ (props changed) Copied: branches/2016Q3/databases/mysql57-client/files/patch-cmake_ssl.cmake (from r420816, head/databases/mysql57-client/files/patch-cmake_ssl.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/databases/mysql57-client/files/patch-cmake_ssl.cmake Sun Sep 11 09:00:17 2016 (r421809, copy of r420816, head/databases/mysql57-client/files/patch-cmake_ssl.cmake) @@ -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: branches/2016Q3/databases/mysql57-server/Makefile ============================================================================== --- branches/2016Q3/databases/mysql57-server/Makefile Sun Sep 11 08:59:04 2016 (r421808) +++ branches/2016Q3/databases/mysql57-server/Makefile Sun Sep 11 09:00:17 2016 (r421809) @@ -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 Copied: branches/2016Q3/databases/mysql57-server/files/patch-cmake_ssl.cmake (from r420816, head/databases/mysql57-server/files/patch-cmake_ssl.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/databases/mysql57-server/files/patch-cmake_ssl.cmake Sun Sep 11 09:00:17 2016 (r421809, copy of r420816, head/databases/mysql57-server/files/patch-cmake_ssl.cmake) @@ -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?201609110900.u8B90HPa092647>