Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Jan 2017 17:40:07 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r432066 - in head/databases/mysql56-server: . files
Message-ID:  <201701211740.v0LHe7o2048326@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sat Jan 21 17:40:07 2017
New Revision: 432066
URL: https://svnweb.freebsd.org/changeset/ports/432066

Log:
  Revert r432035 part 2, it breaks build with openssl from base
  
  With hat:	portmgr

Deleted:
  head/databases/mysql56-server/files/patch-cmake_ssl.cmake
Modified:
  head/databases/mysql56-server/Makefile

Modified: head/databases/mysql56-server/Makefile
==============================================================================
--- head/databases/mysql56-server/Makefile	Sat Jan 21 17:33:35 2017	(r432065)
+++ head/databases/mysql56-server/Makefile	Sat Jan 21 17:40:07 2017	(r432066)
@@ -54,7 +54,6 @@ CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DWITH_LIBEVENT=system \
 		-DWITH_LZ4=system \
 		-DWITH_ZLIB=system \
-		-DWITH_SSL=${OPENSSLBASE} \
 		-DINSTALL_MYSQLTESTDIR=0
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
@@ -130,6 +129,12 @@ PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--s
 
 .include <bsd.port.pre.mk>
 
+.if ${SSL_DEFAULT} == base
+CMAKE_ARGS+=		-DWITH_SSL=system
+.else
+CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701211740.v0LHe7o2048326>