[28302] trunk/base

[source_changes at macosforge.org]

Revision: 28302
          http://trac.macosforge.org/projects/macports/changeset/28302
Author:   mww at macports.org
Date:     2007-08-27 17:46:39 -0700 (Mon, 27 Aug 2007)

Log Message:
-----------
Add more compiler suites for the 'configure.compiler' option

Modified Paths:
--------------
    trunk/base/ChangeLog
    trunk/base/doc/portfile.7
    trunk/base/src/port1.0/portconfigure.tcl

Modified: trunk/base/ChangeLog
===================================================================
--- trunk/base/ChangeLog	2007-08-28 00:25:34 UTC (rev 28301)
+++ trunk/base/ChangeLog	2007-08-28 00:46:39 UTC (rev 28302)
@@ -6,6 +6,8 @@
 
 Unreleased:
 
+    - Add more compiler suites for the 'configure.compiler' option
+
     - `port variants` behaves like `port info` in that it parses the Portfile for up-to-date info.
       `port variants` also supports the --index flag (eridius in r27919).
 

Modified: trunk/base/doc/portfile.7
===================================================================
--- trunk/base/doc/portfile.7	2007-08-28 00:25:34 UTC (rev 28301)
+++ trunk/base/doc/portfile.7	2007-08-28 00:46:39 UTC (rev 28302)
@@ -852,12 +852,25 @@
 .Em optional
 .It Ic configure.compiler
 Selects a complete compiler suite to use. This option will override the compiler environment variable for all compilers the named suite features. Please note that this option will intentionally not set any dependencies on the selected compiler suite!
+.Em gcc-3.3
+.Em gcc-4.0
+use the standard system compiler suites,
+.Em apple-gcc-3.3
+.Em apple-gcc-4.0
+use Apple's gcc suite installed via MacPorts,
+.Em macports-gcc-3.3
+.Em macports-gcc-3.4
+.Em macports-gcc-4.0
+.Em macports-gcc-4.1
+.Em macports-gcc-4.2
+.Em macports-gcc-4.3
+use the vanilla gcc installed via MacPorts.
 .br
 .Sy Type:
 .Em optional
 .br
 .Sy Values:
-.Em gcc-3.3 gcc-4.0 macports-gcc-4.0 macports-gcc-4.1 macports-gcc-4.2
+.Em gcc-3.3 gcc-4.0 apple-gcc-3.3 apple-gcc-4.0 macports-gcc-3.3 macports-gcc-3.4 macports-gcc-4.0 macports-gcc-4.1 macports-gcc-4.2 macports-gcc-4.3
 .br
 .Sy Example:
 .Dl configure.compiler gcc-4.0

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2007-08-28 00:25:34 UTC (rev 28301)
+++ trunk/base/src/port1.0/portconfigure.tcl	2007-08-28 00:46:39 UTC (rev 28302)
@@ -118,6 +118,24 @@
             set configure.cc "/usr/bin/gcc-4.0"
             set configure.cxx "/usr/bin/g++-4.0"
             set configure.cpp "/usr/bin/cpp-4.0" }
+        apple-gcc-3.3 {
+            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" }
+        apple-gcc-4.0 {
+            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" }
         macports-gcc-4.0 {
             ui_debug "Using MacPorts gcc 4.0"
             set configure.cc "${prefix}/bin/gcc-mp-4.0"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070827/844f6ae5/attachment.html