Date: Fri, 14 Dec 2018 09:35:00 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487417 - head/Mk/Uses Message-ID: <201812140935.wBE9Z0Ga036107@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Dec 14 09:34:59 2018 New Revision: 487417 URL: https://svnweb.freebsd.org/changeset/ports/487417 Log: Move the BROKEN_SSL/IGNORE_SSL at a place where a value of base actually works. Modified: head/Mk/Uses/ssl.mk Modified: head/Mk/Uses/ssl.mk ============================================================================== --- head/Mk/Uses/ssl.mk Fri Dec 14 09:34:22 2018 (r487416) +++ head/Mk/Uses/ssl.mk Fri Dec 14 09:34:59 2018 (r487417) @@ -41,6 +41,26 @@ _SSL_BUILD_DEP= 1 _SSL_RUN_DEP= 1 .endif +.if defined(BROKEN_SSL) && ${BROKEN_SSL:M${SSL_DEFAULT}} +. if defined(BROKEN_SSL_REASON_${SSL_DEFAULT}) +BROKEN= does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${BROKEN_SSL_REASON_${SSL_DEFAULT}} +. elif defined(BROKEN_SSL_REASON) +BROKEN= does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${BROKEN_SSL_REASON} +. else +BROKEN= does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} +. endif +.endif + +.if defined(IGNORE_SSL) && ${IGNORE_SSL:M${SSL_DEFAULT}} +. if defined(IGNORE_SSL_REASON_${SSL_DEFAULT}) +IGNORE= not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${IGNORE_SSL_REASON_${SSL_DEFAULT}} +. elif defined(IGNORE_SSL_REASON) +IGNORE= not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${IGNORE_SSL_REASON} +. else +IGNORE= not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} +. endif +.endif + .if ${SSL_DEFAULT} == base OPENSSLBASE= /usr OPENSSLDIR?= /etc/ssl @@ -75,26 +95,6 @@ OPENSSL_PORT= security/${SSL_DEFAULT} . if !defined(OPENSSL_SHLIBVER) .error You are using an unsupported SSL provider ${SSL_DEFAULT} -. endif - -. if defined(BROKEN_SSL) && ${BROKEN_SSL:M${SSL_DEFAULT}} -. if defined(BROKEN_SSL_REASON_${SSL_DEFAULT}) -BROKEN= does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${BROKEN_SSL_REASON_${SSL_DEFAULT}} -. elif defined(BROKEN_SSL_REASON) -BROKEN= does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${BROKEN_SSL_REASON} -. else -BROKEN= does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} -. endif -. endif - -. if defined(IGNORE_SSL) && ${IGNORE_SSL:M${SSL_DEFAULT}} -. if defined(IGNORE_SSL_REASON_${SSL_DEFAULT}) -IGNORE= not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${IGNORE_SSL_REASON_${SSL_DEFAULT}} -. elif defined(IGNORE_SSL_REASON) -IGNORE= not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${IGNORE_SSL_REASON} -. else -IGNORE= not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} -. endif . endif OPENSSLDIR?= ${OPENSSLBASE}/openssl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812140935.wBE9Z0Ga036107>