[106718] trunk/base/src/port1.0
jmr at macports.org
jmr at macports.org
Thu Jun 6 00:05:58 PDT 2013
Revision: 106718
https://trac.macports.org/changeset/106718
Author: jmr at macports.org
Date: 2013-06-06 00:05:58 -0700 (Thu, 06 Jun 2013)
Log Message:
-----------
add options to disable automatic dependency adding based on configure.compiler and build.type, if needed
Modified Paths:
--------------
trunk/base/src/port1.0/portbuild.tcl
trunk/base/src/port1.0/portconfigure.tcl
Modified: trunk/base/src/port1.0/portbuild.tcl
===================================================================
--- trunk/base/src/port1.0/portbuild.tcl 2013-06-06 05:59:31 UTC (rev 106717)
+++ trunk/base/src/port1.0/portbuild.tcl 2013-06-06 07:05:58 UTC (rev 106718)
@@ -66,6 +66,10 @@
# ${build.type} == bsd, ensures bsdmake is present by adding a bin:-style
# dependency.
proc portbuild::add_automatic_buildsystem_dependencies {} {
+ global build.type.add_deps
+ if {!${build.type.add_deps}} {
+ return
+ }
if {[option build.type] == "bsd" && [option os.platform] == "darwin"} {
ui_debug "build.type is BSD, adding bin:bsdmake:bsdmake build dependency"
depends_build-delete bin:bsdmake:bsdmake
@@ -79,6 +83,9 @@
}
# Register the above procedure as a callback after Portfile evaluation
port::register_callback portbuild::add_automatic_buildsystem_dependencies
+# and an option to turn it off if required
+options build.type.add_deps
+default build.type.add_deps yes
proc portbuild::build_getmaketype {args} {
if {[option build.type] == "default"} {
Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl 2013-06-06 05:59:31 UTC (rev 106717)
+++ trunk/base/src/port1.0/portconfigure.tcl 2013-06-06 07:05:58 UTC (rev 106718)
@@ -590,8 +590,12 @@
# Some of the compilers we use are provided by MacPorts itself; ensure we
# automatically add a dependency when needed
proc portconfigure::add_automatic_compiler_dependencies {} {
- global configure.compiler
+ global configure.compiler configure.compiler.add_deps
+ if {!${configure.compiler.add_deps}} {
+ return
+ }
+
# The default value requires substitution before use.
set compiler [subst ${configure.compiler}]
if {![compiler_is_port $compiler]} {
@@ -617,6 +621,9 @@
}
# Register the above procedure as a callback after Portfile evaluation
port::register_callback portconfigure::add_automatic_compiler_dependencies
+# and an option to turn it off if required
+options configure.compiler.add_deps
+default configure.compiler.add_deps yes
proc portconfigure::configure_main {args} {
global [info globals]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130606/598d38c6/attachment.html>
More information about the macports-changes
mailing list