[101273] branches/release_2_1

[jmr at macports.org]

Revision: 101273
          https://trac.macports.org/changeset/101273
Author:   jmr at macports.org
Date:     2013-01-07 07:00:00 -0800 (Mon, 07 Jan 2013)
Log Message:
-----------
merge r92588, r101163, r101166, r101270 from trunk:
 Add support for macports-clang-3.2
 Tell base about clang-3.3

Revision Links:
--------------
    https://trac.macports.org/changeset/92588
    https://trac.macports.org/changeset/101163
    https://trac.macports.org/changeset/101166
    https://trac.macports.org/changeset/101270

Modified Paths:
--------------
    branches/release_2_1/base/src/port1.0/portconfigure.tcl

Property Changed:
----------------
    branches/release_2_1/
    branches/release_2_1/base/


Property changes on: branches/release_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275,99754,99822,99857,100679,100828
   + /trunk:91825,91829,91834,92072,92342,92404,92546,92588,92730,92785,92881,92903,92976,93062,93153,93197,93250,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96262,96535,97264,97367,97999,98190,98313,99275,99754,99822,99857,100679,100828,101163,101166,101270


Property changes on: branches/release_2_1/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342,92404,92546,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,99754,99822,99857,100129,100217-100220,100679,100828
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:91825,91829,91834,92072,92342,92404,92546,92588,92730,92785,92881,92903,92976,93062,93129,93153,93197,93250,93256,93258-93259,93261,93268,93274,93303,93339,93511-93512,93816,93962,95382,95438-95439,95480,95552,95616,95620,95873,96136-96137,96262,96399-96401,96535,96538-96539,97264,97367,97868-97869,97999,98190,98313,99275,99754,99822,99857,100129,100217-100220,100679,100828,101163,101166,101270
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_1/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/release_2_1/base/src/port1.0/portconfigure.tcl	2013-01-07 14:54:10 UTC (rev 101272)
+++ branches/release_2_1/base/src/port1.0/portconfigure.tcl	2013-01-07 15:00:00 UTC (rev 101273)
@@ -222,6 +222,8 @@
         macports-clang-2.9 { set name "MacPorts clang 2.9" }
         macports-clang-3.0 { set name "MacPorts clang 3.0" }
         macports-clang-3.1 { set name "MacPorts clang 3.1" }
+        macports-clang-3.2 { set name "MacPorts clang 3.2" }
+        macports-clang-3.3 { set name "MacPorts clang 3.3" }
         default { return -code error "Invalid value for configure.compiler" }
     }
     ui_debug "Using compiler '$name'"
@@ -369,6 +371,8 @@
         macports-clang-2.9 -
         macports-clang-3.0 -
         macports-clang-3.1 -
+        macports-clang-3.2 -
+        macports-clang-3.3 -
         macports-clang {
             return yes
         }
@@ -405,6 +409,8 @@
         macports-clang-2.9      clang-2.9
         macports-clang-3.0      clang-3.0
         macports-clang-3.1      clang-3.1
+        macports-clang-3.2      clang-3.2
+        macports-clang-3.3      clang-3.3
 }
 
 # internal function to determine the default compiler
@@ -683,6 +689,20 @@
                 cxx  { set ret ${prefix}/bin/clang++-mp-3.1 }
             }
         }
+        macports-clang-3.2 {
+            switch -exact ${type} {
+                cc   { set ret ${prefix}/bin/clang-mp-3.2 }
+                objc { set ret ${prefix}/bin/clang-mp-3.2 }
+                cxx  { set ret ${prefix}/bin/clang++-mp-3.2 }
+            }
+        }
+        macports-clang-3.3 {
+            switch -exact ${type} {
+                cc   { set ret ${prefix}/bin/clang-mp-3.3 }
+                objc { set ret ${prefix}/bin/clang-mp-3.3 }
+                cxx  { set ret ${prefix}/bin/clang++-mp-3.3 }
+            }
+        }
     }
     return $ret
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130107/fec77ff1/attachment.html>