pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Add MULTI variable, and add it to BUILD_DEFS, to mo...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2c0a2e978ada
branches: trunk
changeset: 586409:2c0a2e978ada
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Mar 12 14:07:13 2011 +0000
description:
Add MULTI variable, and add it to BUILD_DEFS, to more easily find
variable settings affecting binary packages.
>From Aleksey Cheusov in PR 44695.
diffstat:
lang/php/phpversion.mk | 6 +++++-
lang/python/pyversion.mk | 6 +++++-
lang/ruby/rubyversion.mk | 6 +++++-
mk/apache.mk | 6 +++++-
mk/bsd.pkg.mk | 9 ++++++++-
5 files changed, 28 insertions(+), 5 deletions(-)
diffs (101 lines):
diff -r 682d6412df1d -r 2c0a2e978ada lang/php/phpversion.mk
--- a/lang/php/phpversion.mk Sat Mar 12 13:59:59 2011 +0000
+++ b/lang/php/phpversion.mk Sat Mar 12 14:07:13 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.13 2010/09/23 07:38:05 taca Exp $
+# $NetBSD: phpversion.mk,v 1.14 2011/03/12 14:07:13 wiz Exp $
#
# This file selects a PHP version, based on the user's preferences and
# the installed packages. It does not add a dependency on the PHP
@@ -136,6 +136,10 @@
_PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPTED}
.endif
+#
+# Variable assignment for multi-PHP packages
+MULTI+= PHP_VERSION_REQD=${_PHP_VERSION}
+
# export some of internal variables
PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//}
PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/}
diff -r 682d6412df1d -r 2c0a2e978ada lang/python/pyversion.mk
--- a/lang/python/pyversion.mk Sat Mar 12 13:59:59 2011 +0000
+++ b/lang/python/pyversion.mk Sat Mar 12 14:07:13 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.86 2011/02/25 09:47:24 wiz Exp $
+# $NetBSD: pyversion.mk,v 1.87 2011/03/12 14:07:13 wiz Exp $
# This file determines which Python version is used as a dependency for
# a package.
@@ -112,6 +112,10 @@
. endif
.endif
+#
+# Variable assignment for multi-python packages
+MULTI+= PYTHON_VERSION_REQD=${_PYTHON_VERSION}
+
# No supported version found, annotate to simplify statements below.
.if !defined(_PYTHON_VERSION)
_PYTHON_VERSION= none
diff -r 682d6412df1d -r 2c0a2e978ada lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk Sat Mar 12 13:59:59 2011 +0000
+++ b/lang/ruby/rubyversion.mk Sat Mar 12 14:07:13 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.59 2011/02/21 15:00:34 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.60 2011/03/12 14:07:13 wiz Exp $
#
.if !defined(_RUBYVERSION_MK)
@@ -61,6 +61,10 @@
RUBY_ABI_VERSION= ${RUBY19_API_VERSION}
.endif
+#
+# Variable assignment for multi-ruby packages
+MULTI+= RUBY_VERSION_REQD=${RUBY_VERSION_REQD:U${_RUBY_VERSION_DEFAULT}}
+
# RUBY_VERSION_SUPPORTED defines the list of ${RUBY_VER} which is
# supported by the package. It should be defined by the packages
# for specific Ruby versions.
diff -r 682d6412df1d -r 2c0a2e978ada mk/apache.mk
--- a/mk/apache.mk Sat Mar 12 13:59:59 2011 +0000
+++ b/mk/apache.mk Sat Mar 12 14:07:13 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: apache.mk,v 1.25 2007/12/17 22:09:58 tron Exp $
+# $NetBSD: apache.mk,v 1.26 2011/03/12 14:07:13 wiz Exp $
#
# This file is meant to be included by packages that require an apache
# web server.
@@ -135,4 +135,8 @@
. include "../../devel/apr-util/buildlink3.mk"
.endif
+#
+# Variable assignment for multi-apache packages
+MULTI+= PKG_APACHE=${PKG_APACHE}
+
.endif # APACHE_MK
diff -r 682d6412df1d -r 2c0a2e978ada mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Sat Mar 12 13:59:59 2011 +0000
+++ b/mk/bsd.pkg.mk Sat Mar 12 14:07:13 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1976 2011/02/07 10:32:32 wiz Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1977 2011/03/12 14:07:13 wiz Exp $
#
# This file is in the public domain.
#
@@ -205,6 +205,13 @@
PKG_FAIL_REASON+= "DEPOT_SUBDIR may not be empty."
.endif
+# Store the build options for multi-packages, i.e. packages that can
+# be built with multiple versions of Apache, Python, Ruby, PHP etc.
+#
+.if defined(MULTI)
+_BUILD_DEFS+= MULTI
+.endif
+
# ZERO_FILESIZE_P exits with a successful return code if the given file
# has zero length.
# NONZERO_FILESIZE_P exits with a successful return code if the given file
Home |
Main Index |
Thread Index |
Old Index