pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/php once PHP version is selected, set PHP_VERSION...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/634d1d0fd417
branches:  trunk
changeset: 493562:634d1d0fd417
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Mon May 09 19:24:46 2005 +0000

description:
once PHP version is selected, set PHP_VERSION_REQD appropriately, so that
the selected version is forced for any sub-builds; this should fix
the bulk build problems for php5-extensions

use := to avoid variable recursion

diffstat:

 lang/php/phpversion.mk |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r d932a9425269 -r 634d1d0fd417 lang/php/phpversion.mk
--- a/lang/php/phpversion.mk    Mon May 09 18:37:56 2005 +0000
+++ b/lang/php/phpversion.mk    Mon May 09 19:24:46 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.2 2004/11/04 18:40:39 jdolecek Exp $
+# $NetBSD: phpversion.mk,v 1.3 2005/05/09 19:24:46 jdolecek Exp $
 # PHP wrapper, for module builds
 
 .if !defined(PHPVERSION_MK)
@@ -57,13 +57,16 @@
 .endif
 
 # export some of internal variables
-PKG_PHP_VERSION=       ${_PHP_VERSION}
-PKG_PHP=               PHP${_PHP_VERSION}
+PKG_PHP_VERSION:=      ${_PHP_VERSION}
+PKG_PHP:=              PHP${_PHP_VERSION}
 
 MESSAGE_SUBST+=                PKG_PHP_VERSION=${PKG_PHP_VERSION} \
                        PKG_PHP=${PKG_PHP}
 PLIST_SUBST+=          PKG_PHP_VERSION=${PKG_PHP_VERSION}
 
+# force the selected PHP version for recursive builds
+PHP_VERSION_REQD:=     ${PKG_PHP_VERSION}
+
 #
 # set variables for the version we decided to use:
 #



Home | Main Index | Thread Index | Old Index