<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[31152] 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/31152">31152</a></dd>
<dt>Author</dt> <dd>nox@macports.org</dd>
<dt>Date</dt> <dd>2007-11-16 18:49:03 -0800 (Fri, 16 Nov 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>portconfigure: Whitespace changes, added modeline.</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 (31151 => 31152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portconfigure.tcl 2007-11-17 01:55:24 UTC (rev 31151)
+++ trunk/base/src/port1.0/portconfigure.tcl 2007-11-17 02:49:03 UTC (rev 31152)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# et:ts=4
</del><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
</ins><span class="cx"> # portconfigure.tcl
</span><span class="cx"> # $Id$
</span><span class="cx"> #
</span><span class="lines">@@ -42,42 +42,42 @@
</span><span class="cx"> # define options
</span><span class="cx"> commands configure automake autoconf xmkmf libtool
</span><span class="cx"> # defaults
</span><del>-default configure.env ""
-default configure.pre_args {--prefix=${prefix}}
-default configure.cmd ./configure
-default configure.dir {${worksrcpath}}
-default autoconf.dir {${worksrcpath}}
-default automake.dir {${worksrcpath}}
-default xmkmf.cmd xmkmf
-default xmkmf.dir {${worksrcpath}}
-default use_configure yes
</del><ins>+default configure.env ""
+default configure.pre_args {--prefix=${prefix}}
+default configure.cmd ./configure
+default configure.dir {${worksrcpath}}
+default autoconf.dir {${worksrcpath}}
+default automake.dir {${worksrcpath}}
+default xmkmf.cmd xmkmf
+default xmkmf.dir {${worksrcpath}}
+default use_configure yes
</ins><span class="cx">
</span><span class="cx"> # Configure special environment variables.
</span><span class="cx"> # We could have default debug/optimization flags at some point.
</span><span class="cx"> # compiler flags section
</span><span class="cx"> options configure.cflags configure.cppflags configure.cxxflags configure.objcflags configure.ldflags configure.libs configure.fflags configure.f90flags configure.fcflags configure.classpath
</span><del>-default configure.pipe {${configurepipe}}
-default configure.cflags {-O2}
-default configure.cppflags {"-I${prefix}/include"}
-default configure.cxxflags {-O2}
-default configure.objcflags {-O2}
-default configure.ldflags {"-L${prefix}/lib"}
-default configure.libs {}
-default configure.fflags {-O2}
-default configure.f90flags {-O2}
-default configure.fcflags {-O2}
-default configure.classpath {}
</del><ins>+default configure.pipe {${configurepipe}}
+default configure.cflags {-O2}
+default configure.cppflags {"-I${prefix}/include"}
+default configure.cxxflags {-O2}
+default configure.objcflags {-O2}
+default configure.ldflags {"-L${prefix}/lib"}
+default configure.libs {}
+default configure.fflags {-O2}
+default configure.f90flags {-O2}
+default configure.fcflags {-O2}
+default configure.classpath {}
</ins><span class="cx">
</span><span class="cx"> # tools section
</span><span class="cx"> options configure.perl configure.python configure.ruby configure.install configure.awk configure.bison configure.pkg_config configure.pkg_config_path
</span><del>-default configure.perl {}
-default configure.python {}
-default configure.ruby {}
-default configure.install {"/usr/bin/install"}
-default configure.awk {}
-default configure.bison {}
-default configure.pkg_config {}
-default configure.pkg_config_path {}
</del><ins>+default configure.perl {}
+default configure.python {}
+default configure.ruby {}
+default configure.install {"/usr/bin/install"}
+default configure.awk {}
+default configure.bison {}
+default configure.pkg_config {}
+default configure.pkg_config_path {}
</ins><span class="cx">
</span><span class="cx"> # Universal options & default values.
</span><span class="cx"> if {[file exists /Developer/SDKs/MacOSX10.5.sdk]} {
</span><span class="lines">@@ -85,26 +85,26 @@
</span><span class="cx"> } else {
</span><span class="cx"> set sysroot "/Developer/SDKs/MacOSX10.4u.sdk"
</span><span class="cx"> }
</span><del>-options configure.universal_args configure.universal_cflags configure.universal_cppflags configure.universal_cxxflags configure.universal_ldflags configure.universal_env
-default configure.universal_args --disable-dependency-tracking
-default configure.universal_cflags {"-isysroot $sysroot -arch i386 -arch ppc"}
-default configure.universal_cppflags {}
-default configure.universal_cxxflags {"-isysroot $sysroot -arch i386 -arch ppc"}
-default configure.universal_ldflags {"-arch i386 -arch ppc"}
</del><ins>+options configure.universal_args configure.universal_cflags configure.universal_cppflags configure.universal_cxxflags configure.universal_ldflags configure.universal_env
+default configure.universal_args --disable-dependency-tracking
+default configure.universal_cflags {"-isysroot $sysroot -arch i386 -arch ppc"}
+default configure.universal_cppflags {}
+default configure.universal_cxxflags {"-isysroot $sysroot -arch i386 -arch ppc"}
+default configure.universal_ldflags {"-arch i386 -arch ppc"}
</ins><span class="cx">
</span><span class="cx"> # Select a distinct compiler (C, C preprocessor, C++)
</span><span class="cx"> options configure.ccache configure.distcc configure.cc configure.cxx configure.cpp configure.objc configure.f77 configure.f90 configure.fc configure.javac configure.compiler
</span><del>-default configure.ccache {${configureccache}}
-default configure.distcc {${configuredistcc}}
-default configure.cc {}
-default configure.cxx {}
-default configure.cpp {}
-default configure.objc {}
-default configure.f77 {}
-default configure.f90 {}
-default configure.fc {}
-default configure.javac {}
-default configure.compiler {}
</del><ins>+default configure.ccache {${configureccache}}
+default configure.distcc {${configuredistcc}}
+default configure.cc {}
+default configure.cxx {}
+default configure.cpp {}
+default configure.objc {}
+default configure.f77 {}
+default configure.f90 {}
+default configure.fc {}
+default configure.javac {}
+default configure.compiler {}
</ins><span class="cx">
</span><span class="cx"> set_ui_prefix
</span><span class="cx">
</span><span class="lines">@@ -148,17 +148,17 @@
</span><span class="cx"> global os.platform os.major
</span><span class="cx">
</span><span class="cx"> if {[tbool use_automake]} {
</span><del>- # XXX depend on automake
- if {[catch {command_exec automake} result]} {
- return -code error "[format [msgcat::mc "%s failure: %s"] automake $result]"
- }
</del><ins>+ # XXX depend on automake
+ if {[catch {command_exec automake} result]} {
+ return -code error "[format [msgcat::mc "%s failure: %s"] automake $result]"
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[tbool use_autoconf]} {
</span><del>- # XXX depend on autoconf
- if {[catch {command_exec autoconf} result]} {
- return -code error "[format [msgcat::mc "%s failure: %s"] autoconf $result]"
- }
</del><ins>+ # XXX depend on autoconf
+ if {[catch {command_exec autoconf} result]} {
+ return -code error "[format [msgcat::mc "%s failure: %s"] autoconf $result]"
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # 1st chose a reasonable default compiler suite for each platform if none was chosen
</span><span class="lines">@@ -244,69 +244,69 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[tbool use_xmkmf]} {
</span><del>- # XXX depend on xmkmf
- if {[catch {command_exec xmkmf} result]} {
- return -code error "[format [msgcat::mc "%s failure: %s"] xmkmf $result]"
- } else {
- # XXX should probably use make command abstraction but we know that
- # X11 will already set things up so that "make Makefiles" always works.
- system "cd ${worksrcpath} && make Makefiles"
- }
- } elseif {[tbool use_configure]} {
- # Merge (ld|c|cpp|cxx)flags into the environment variable.
- parse_environment configure
</del><ins>+ # XXX depend on xmkmf
+ if {[catch {command_exec xmkmf} result]} {
+ return -code error "[format [msgcat::mc "%s failure: %s"] xmkmf $result]"
+ } else {
+ # XXX should probably use make command abstraction but we know that
+ # X11 will already set things up so that "make Makefiles" always works.
+ system "cd ${worksrcpath} && make Makefiles"
+ }
+ } elseif {[tbool use_configure]} {
+ # Merge (ld|c|cpp|cxx)flags into the environment variable.
+ parse_environment configure
</ins><span class="cx">
</span><del>- # Set pre-compiler filter to use (ccache/distcc), if any.
- if {[tbool configure.ccache] && [tbool configure.distcc]} {
- set filter "ccache "
- append_list_to_environment_value configure "CCACHE_PREFIX" "distcc"
- } elseif {[tbool configure.ccache]} {
- set filter "ccache "
- } elseif {[tbool configure.distcc]} {
- set filter "distcc "
- } else {
- set filter ""
- }
-
- # Set flags controlling the kind of compiler output.
- if {[tbool configure.pipe]} {
- set output "-pipe "
- } else {
- set output ""
- }
</del><ins>+ # Set pre-compiler filter to use (ccache/distcc), if any.
+ if {[tbool configure.ccache] && [tbool configure.distcc]} {
+ set filter "ccache "
+ append_list_to_environment_value configure "CCACHE_PREFIX" "distcc"
+ } elseif {[tbool configure.ccache]} {
+ set filter "ccache "
+ } elseif {[tbool configure.distcc]} {
+ set filter "distcc "
+ } else {
+ set filter ""
+ }
+
+ # Set flags controlling the kind of compiler output.
+ if {[tbool configure.pipe]} {
+ set output "-pipe "
+ } else {
+ set output ""
+ }
</ins><span class="cx">
</span><del>- # Append configure flags.
- append_list_to_environment_value configure "CC" ${filter}${configure.cc}
- append_list_to_environment_value configure "CPP" ${filter}${configure.cpp}
- append_list_to_environment_value configure "CXX" ${filter}${configure.cxx}
- append_list_to_environment_value configure "OBJC" ${filter}${configure.objc}
- append_list_to_environment_value configure "FC" ${configure.fc}
- append_list_to_environment_value configure "F77" ${configure.f77}
- append_list_to_environment_value configure "F90" ${configure.f90}
- append_list_to_environment_value configure "JAVAC" ${configure.javac}
- append_list_to_environment_value configure "CFLAGS" ${output}${configure.cflags}
- append_list_to_environment_value configure "CPPFLAGS" ${configure.cppflags}
- append_list_to_environment_value configure "CXXFLAGS" ${output}${configure.cxxflags}
- append_list_to_environment_value configure "OBJCFLAGS" ${output}${configure.objcflags}
- append_list_to_environment_value configure "LDFLAGS" ${configure.ldflags}
- append_list_to_environment_value configure "LIBS" ${configure.libs}
- append_list_to_environment_value configure "FFLAGS" ${output}${configure.fflags}
- append_list_to_environment_value configure "F90FLAGS" ${output}${configure.f90flags}
- append_list_to_environment_value configure "FCFLAGS" ${output}${configure.fcflags}
- append_list_to_environment_value configure "CLASSPATH" ${configure.classpath}
- append_list_to_environment_value configure "PERL" ${configure.perl}
- append_list_to_environment_value configure "PYTHON" ${configure.python}
- append_list_to_environment_value configure "RUBY" ${configure.ruby}
- append_list_to_environment_value configure "INSTALL" ${configure.install}
- append_list_to_environment_value configure "AWK" ${configure.awk}
- append_list_to_environment_value configure "BISON" ${configure.bison}
- append_list_to_environment_value configure "PKG_CONFIG" ${configure.pkg_config}
- append_list_to_environment_value configure "PKG_CONFIG_PATH" ${configure.pkg_config_path}
</del><ins>+ # Append configure flags.
+ append_list_to_environment_value configure "CC" ${filter}${configure.cc}
+ append_list_to_environment_value configure "CPP" ${filter}${configure.cpp}
+ append_list_to_environment_value configure "CXX" ${filter}${configure.cxx}
+ append_list_to_environment_value configure "OBJC" ${filter}${configure.objc}
+ append_list_to_environment_value configure "FC" ${configure.fc}
+ append_list_to_environment_value configure "F77" ${configure.f77}
+ append_list_to_environment_value configure "F90" ${configure.f90}
+ append_list_to_environment_value configure "JAVAC" ${configure.javac}
+ append_list_to_environment_value configure "CFLAGS" ${output}${configure.cflags}
+ append_list_to_environment_value configure "CPPFLAGS" ${configure.cppflags}
+ append_list_to_environment_value configure "CXXFLAGS" ${output}${configure.cxxflags}
+ append_list_to_environment_value configure "OBJCFLAGS" ${output}${configure.objcflags}
+ append_list_to_environment_value configure "LDFLAGS" ${configure.ldflags}
+ append_list_to_environment_value configure "LIBS" ${configure.libs}
+ append_list_to_environment_value configure "FFLAGS" ${output}${configure.fflags}
+ append_list_to_environment_value configure "F90FLAGS" ${output}${configure.f90flags}
+ append_list_to_environment_value configure "FCFLAGS" ${output}${configure.fcflags}
+ append_list_to_environment_value configure "CLASSPATH" ${configure.classpath}
+ append_list_to_environment_value configure "PERL" ${configure.perl}
+ append_list_to_environment_value configure "PYTHON" ${configure.python}
+ append_list_to_environment_value configure "RUBY" ${configure.ruby}
+ append_list_to_environment_value configure "INSTALL" ${configure.install}
+ append_list_to_environment_value configure "AWK" ${configure.awk}
+ append_list_to_environment_value configure "BISON" ${configure.bison}
+ append_list_to_environment_value configure "PKG_CONFIG" ${configure.pkg_config}
+ append_list_to_environment_value configure "PKG_CONFIG_PATH" ${configure.pkg_config_path}
</ins><span class="cx">
</span><del>- # Execute the command (with the new environment).
- if {[catch {command_exec configure} result]} {
- return -code error "[format [msgcat::mc "%s failure: %s"] configure $result]"
- }
</del><ins>+ # Execute the command (with the new environment).
+ if {[catch {command_exec configure} result]} {
+ return -code error "[format [msgcat::mc "%s failure: %s"] configure $result]"
+ }
</ins><span class="cx"> }
</span><span class="cx"> return 0
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>