Date: Mon, 12 Sep 2016 15:08:19 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421927 - head/databases/mysql57-server Message-ID: <201609121508.u8CF8JRE063225@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Sep 12 15:08:19 2016 New Revision: 421927 URL: https://svnweb.freebsd.org/changeset/ports/421927 Log: databass/mysql57-server: Fix configuration of non-base SSL on all platforms This simplifies the logic involved. Now the port will present as BROKEN if it's built on FreeBSD 9 using the base SSL library. Approved by: SSL blanket Modified: head/databases/mysql57-server/Makefile Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Mon Sep 12 14:52:51 2016 (r421926) +++ head/databases/mysql57-server/Makefile Mon Sep 12 15:08:19 2016 (r421927) @@ -128,27 +128,21 @@ PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" .endif -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> ### Just for the sake of FreeBSD 9.X ### .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -.if !defined(CLIENT_ONLY) +. if !defined(CLIENT_ONLY) EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc -.endif -WITH_OPENSSL_PORT= yes -CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} +. endif .endif -.include <bsd.port.pre.mk> - -### FreeBSD Version > 9.X ### -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 .if ${SSL_DEFAULT} == base +BROKEN_FreeBSD_9= FreeBSD 9.x requires SSL from ports CMAKE_ARGS+= -DWITH_SSL=system .else CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} .endif -.endif post-extract: @${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609121508.u8CF8JRE063225>