Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Sep 2016 14:13:02 +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: r421556 - head/Mk/Uses
Message-ID:  <201609081413.u88ED2Ug067750@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu Sep  8 14:13:01 2016
New Revision: 421556
URL: https://svnweb.freebsd.org/changeset/ports/421556

Log:
  Allow adding only a build or run-time dependency on USES=ssl.
  
  PR:		202175
  Reported by:	barnerd
  Sponsored by:	Absolight

Modified:
  head/Mk/Uses/ssl.mk

Modified: head/Mk/Uses/ssl.mk
==============================================================================
--- head/Mk/Uses/ssl.mk	Thu Sep  8 14:12:58 2016	(r421555)
+++ head/Mk/Uses/ssl.mk	Thu Sep  8 14:13:01 2016	(r421556)
@@ -4,7 +4,7 @@
 #
 # Feature:	SSL_DEFAULT
 # Usage:	USES=ssl
-# Valid ARGS:	none
+# Valid ARGS:	none (build and run), build, run
 #
 # The user can choose which ssl library he wants with:
 #
@@ -28,8 +28,17 @@
 .if !defined(_INCLUDE_USES_SSL_MK)
 _INCLUDE_USES_SSL_MK=	yes
 
-.if !empty(ssl_ARGS)
-IGNORE=	"USES=ssl does not take any argument."
+.if !empty(ssl_ARGS:Nbuild:Nrun)
+IGNORE=	"USES=ssl invalid arguments ${ssl_ARGS}."
+.endif
+
+.if empty(ssl_ARGS) || (!empty(ssl_ARGS:Mbuild) && !empty(ssl_ARGS:Mrun))
+_SSL_BUILD_DEP=	1
+_SSL_RUN_DEP=	1
+.elif !empty(ssl_ARGS:Mbuild)
+_SSL_BUILD_DEP=	1
+.elif !empty(ssl_ARGS:Mrun)
+_SSL_RUN_DEP=	1
 .endif
 
 .if ${SSL_DEFAULT} == base
@@ -87,8 +96,12 @@ OPENSSL_PORT=		security/${SSL_DEFAULT}
 .  endif
 
 OPENSSLDIR?=		${OPENSSLBASE}/openssl
+.if defined(_SSL_BUILD_DEP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
+.endif
+.if defined(_SSL_RUN_DEP)
 RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
+.endif
 OPENSSLRPATH=		${LOCALBASE}/lib
 
 .endif



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