Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jun 2016 13:57:43 +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: r417718 - head/Mk/Uses
Message-ID:  <201606281357.u5SDvh23090594@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Tue Jun 28 13:57:43 2016
New Revision: 417718
URL: https://svnweb.freebsd.org/changeset/ports/417718

Log:
  Add support for USE_PHP=ext:build to add a build dependency on the extension.
  
  PR:		210529
  Submitted by:	mat
  Exp-run by:	antoine
  Sponsored by:	Absolight
  Differential Revision:	https://reviews.freebsd.org/D6936

Modified:
  head/Mk/Uses/php.mk

Modified: head/Mk/Uses/php.mk
==============================================================================
--- head/Mk/Uses/php.mk	Tue Jun 28 13:57:37 2016	(r417717)
+++ head/Mk/Uses/php.mk	Tue Jun 28 13:57:43 2016	(r417718)
@@ -385,18 +385,18 @@ zip_DEPENDS=	archivers/php${PHP_VER}-zip
 zlib_DEPENDS=	archivers/php${PHP_VER}-zlib
 
 .    for extension in ${USE_PHP}
-.      if ${_USE_PHP_VER${PHP_VER}:M${extension}} != ""
-.        if ${PHP_EXT_INC:M${extension}} == ""
-.          if ${php_ARGS:Mbuild}
-BUILD_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${${extension}_DEPENDS}
+ext=		${extension}
+.      if ${_USE_PHP_VER${PHP_VER}:M${ext:S/:build//}} != ""
+.        if ${PHP_EXT_INC:M${extension:S/:build//}} == ""
+.          if !empty(php_ARGS:Mbuild) || !empty(ext:M*\:build)
+BUILD_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension:S/:build//}.so:${${extension:S/:build//}_DEPENDS}
 .          endif
-RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${${extension}_DEPENDS}
+RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension:S/:build//}.so:${${extension:S/:build//}_DEPENDS}
 .        endif
 .      else
-ext=		${extension}
 .        if ${ext:tl} != "yes"
 check-makevars::
-			@${ECHO_CMD} "Unknown extension ${extension} for PHP ${PHP_VER}."
+			@${ECHO_CMD} "Unknown extension ${extension:S/:build//} for PHP ${PHP_VER}."
 			@${FALSE}
 .        endif
 .      endif



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