<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[28474] trunk/base/src/port1.0/portconfigure.tcl</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/macports/changeset/28474">28474</a></dd>
<dt>Author</dt> <dd>mww@macports.org</dd>
<dt>Date</dt> <dd>2007-09-01 05:25:06 -0700 (Sat, 01 Sep 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>rewrite compiler selection process: now allows to override any configure-related variable in the Portfile even if a compiler collection was chosen</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcport10portconfiguretcl">trunk/base/src/port1.0/portconfigure.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcport10portconfiguretcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portconfigure.tcl (28473 => 28474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portconfigure.tcl 2007-09-01 09:08:37 UTC (rev 28473)
+++ trunk/base/src/port1.0/portconfigure.tcl 2007-09-01 12:25:06 UTC (rev 28474)
</span><span class="lines">@@ -86,6 +86,30 @@
</span><span class="cx"> ui_msg "$UI_PREFIX [format [msgcat::mc "Configuring %s"] [option portname]]"
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# internal function for setting compiler variables; use like "_set_compiler string var val var val .."
+# this function will NOT override explicitely set variables from the portfile
+proc select_compiler {info args} {
+ global configure.cc configure.cxx configure.cpp configure.f77 configure.f90 configure.fc
+ ui_debug "Using compiler '$info'"
+ set i 0
+ foreach value $args {
+ if {0==$i} {
+ set comp $value
+ set i 1
+ } else {
+ switch -exact $comp {
+ cc { if {""==${configure.cc}} { set configure.cc $value } }
+ cxx { if {""==${configure.cxx}} { set configure.cxx $value } }
+ cpp { if {""==${configure.cpp}} { set configure.cpp $value } }
+ fc { if {""==${configure.fc}} { set configure.fc $value } }
+ f77 { if {""==${configure.f77}} { set configure.f77 $value } }
+ f90 { if {""==${configure.f90}} { set configure.f90 $value } }
+ }
+ set i 0
+ }
+ }
+}
+
</ins><span class="cx"> proc configure_main {args} {
</span><span class="cx"> global [info globals]
</span><span class="cx"> global worksrcpath use_configure use_autoconf use_automake use_xmkmf
</span><span class="lines">@@ -109,65 +133,55 @@
</span><span class="cx"> # select a compiler collection
</span><span class="cx"> switch -exact ${configure.compiler} {
</span><span class="cx"> gcc-3.3 {
</span><del>- ui_debug "Using Mac OS X gcc 3.3"
- set configure.cc "/usr/bin/gcc-3.3"
- set configure.cxx "/usr/bin/g++-3.3"
- set configure.cpp "/usr/bin/cpp-3.3" }
</del><ins>+ select_compiler "Mac OS X gcc 3.3" \
+ cc /usr/bin/gcc-3.3 \
+ cxx /usr/bin/g++-3.3 \
+ cpp /usr/bin/cpp-3.3 }
</ins><span class="cx"> gcc-4.0 {
</span><del>- ui_debug "Using Mac OS X gcc 4.0"
- set configure.cc "/usr/bin/gcc-4.0"
- set configure.cxx "/usr/bin/g++-4.0"
- set configure.cpp "/usr/bin/cpp-4.0" }
</del><ins>+ select_compiler "Mac OS X gcc 4.0" \
+ cc /usr/bin/gcc-4.0 \
+ cxx /usr/bin/g++-4.0 \
+ cpp /usr/bin/cpp-4.0 }
</ins><span class="cx"> apple-gcc-3.3 {
</span><del>- ui_debug "Using MacPorts Apple gcc 3.3"
- set configure.cc "${prefix}/bin/gcc-apple-3.3"
- set configure.cpp "${prefix}/bin/cpp-apple-3.3" }
</del><ins>+ select_compiler "MacPorts Apple gcc 3.3" \
+ cc ${prefix}/bin/gcc-apple-3.3 \
+ cpp ${prefix}/bin/cpp-apple-3.3 }
</ins><span class="cx"> apple-gcc-4.0 {
</span><del>- ui_debug "Using MacPorts Apple gcc 4.0"
- set configure.cc "${prefix}/bin/gcc-apple-4.0"
- set configure.cpp "${prefix}/bin/cpp-apple-4.0" }
- macports-gcc-3.3 {
- ui_debug "Using MacPorts gcc 3.3"
- set configure.cc "${prefix}/bin/gcc-mp-3.3"
- set configure.cxx "${prefix}/bin/g++-mp-3.3"
- set configure.cpp "${prefix}/bin/cpp-mp-3.3" }
- macports-gcc-3.4 {
- ui_debug "Using MacPorts gcc 3.4"
- set configure.cc "${prefix}/bin/gcc-mp-3.4"
- set configure.cxx "${prefix}/bin/g++-mp-3.4"
- set configure.cpp "${prefix}/bin/cpp-mp-3.4" }
</del><ins>+ select_compiler "MacPorts Apple gcc 4.0" \
+ cc ${prefix}/bin/gcc-apple-4.0 \
+ cpp ${prefix}/bin/cpp-apple-4.0 }
</ins><span class="cx"> macports-gcc-4.0 {
</span><del>- ui_debug "Using MacPorts gcc 4.0"
- set configure.cc "${prefix}/bin/gcc-mp-4.0"
- set configure.cxx "${prefix}/bin/g++-mp-4.0"
- set configure.cpp "${prefix}/bin/cpp-mp-4.0"
- set configure.fc "${prefix}/bin/gfortran-mp-4.0"
- set configure.f77 "${prefix}/bin/gfortran-mp-4.0"
- set configure.f90 "${prefix}/bin/gfortran-mp-4.0" }
</del><ins>+ select_compiler "MacPorts gcc 4.0" \
+ cc ${prefix}/bin/gcc-mp-4.0 \
+ cxx ${prefix}/bin/g++-mp-4.0 \
+ cpp ${prefix}/bin/cpp-mp-4.0 \
+ fc ${prefix}/bin/gfortran-mp-4.0 \
+ f77 ${prefix}/bin/gfortran-mp-4.0 \
+ f90 ${prefix}/bin/gfortran-mp-4.0 }
</ins><span class="cx"> macports-gcc-4.1 {
</span><del>- ui_debug "Using MacPorts gcc 4.1"
- set configure.cc "${prefix}/bin/gcc-mp-4.1"
- set configure.cxx "${prefix}/bin/g++-mp-4.1"
- set configure.cpp "${prefix}/bin/cpp-mp-4.1"
- set configure.fc "${prefix}/bin/gfortran-mp-4.1"
- set configure.f77 "${prefix}/bin/gfortran-mp-4.1"
- set configure.f90 "${prefix}/bin/gfortran-mp-4.1" }
</del><ins>+ select_compiler "MacPorts gcc 4.1" \
+ cc ${prefix}/bin/gcc-mp-4.1 \
+ cxx ${prefix}/bin/g++-mp-4.1 \
+ cpp ${prefix}/bin/cpp-mp-4.1 \
+ fc ${prefix}/bin/gfortran-mp-4.1 \
+ f77 ${prefix}/bin/gfortran-mp-4.1 \
+ f90 ${prefix}/bin/gfortran-mp-4.1 }
</ins><span class="cx"> macports-gcc-4.2 {
</span><del>- ui_debug "Using MacPorts gcc 4.2"
- set configure.cc "${prefix}/bin/gcc-mp-4.2"
- set configure.cxx "${prefix}/bin/g++-mp-4.2"
- set configure.cpp "${prefix}/bin/cpp-mp-4.2"
- set configure.fc "${prefix}/bin/gfortran-mp-4.2"
- set configure.f77 "${prefix}/bin/gfortran-mp-4.2"
- set configure.f90 "${prefix}/bin/gfortran-mp-4.2" }
</del><ins>+ select_compiler "MacPorts gcc 4.2" \
+ cc ${prefix}/bin/gcc-mp-4.2 \
+ cxx ${prefix}/bin/g++-mp-4.2 \
+ cpp ${prefix}/bin/cpp-mp-4.2 \
+ fc ${prefix}/bin/gfortran-mp-4.2 \
+ f77 ${prefix}/bin/gfortran-mp-4.2 \
+ f90 ${prefix}/bin/gfortran-mp-4.2 }
</ins><span class="cx"> macports-gcc-4.3 {
</span><del>- ui_debug "Using MacPorts gcc 4.3"
- set configure.cc "${prefix}/bin/gcc-mp-4.3"
- set configure.cxx "${prefix}/bin/g++-mp-4.3"
- set configure.cpp "${prefix}/bin/cpp-mp-4.3"
- set configure.fc "${prefix}/bin/gfortran-mp-4.3"
- set configure.f77 "${prefix}/bin/gfortran-mp-4.3"
- set configure.f90 "${prefix}/bin/gfortran-mp-4.3" }
</del><ins>+ select_compiler "MacPorts gcc 4.3" \
+ cc ${prefix}/bin/gcc-mp-4.3 \
+ cxx ${prefix}/bin/g++-mp-4.3 \
+ cpp ${prefix}/bin/cpp-mp-4.3 \
+ fc ${prefix}/bin/gfortran-mp-4.3 \
+ f77 ${prefix}/bin/gfortran-mp-4.3 \
+ f90 ${prefix}/bin/gfortran-mp-4.3 }
</ins><span class="cx"> default {
</span><span class="cx"> ui_debug "No compiler collection selected explicitly" }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>