[102177] branches/release_2_1

jmr at macports.org jmr at macports.org
Tue Jan 29 01:44:42 PST 2013


Revision: 102177
          https://trac.macports.org/changeset/102177
Author:   jmr at macports.org
Date:     2013-01-29 01:44:42 -0800 (Tue, 29 Jan 2013)
Log Message:
-----------
merge r101933, r102154 from trunk:
 Add dragonegg compilers as an option

Revision Links:
--------------
    https://trac.macports.org/changeset/101933
    https://trac.macports.org/changeset/102154

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,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,101216,101270,101274,101311,101313,101357,101359,101498
   + /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,101216,101270,101274,101311,101313,101357,101359,101498,101933,102154


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,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,101216,101270,101274,101311,101313,101357,101359,101498
/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,101216,101270,101274,101311,101313,101357,101359,101498,101933,102154
/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-29 09:41:12 UTC (rev 102176)
+++ branches/release_2_1/base/src/port1.0/portconfigure.tcl	2013-01-29 09:44:42 UTC (rev 102177)
@@ -224,6 +224,10 @@
         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" }
+        macports-dragonegg-3.0 { set name "MacPorts dragonegg 3.0" }
+        macports-dragonegg-3.1 { set name "MacPorts dragonegg 3.1" }
+        macports-dragonegg-3.2 { set name "MacPorts dragonegg 3.2" }
+        macports-dragonegg-3.3 { set name "MacPorts dragonegg 3.3" }
         default { return -code error "Invalid value for configure.compiler: ${configure.compiler}" }
     }
     ui_debug "Using compiler '$name'"
@@ -412,6 +416,10 @@
         macports-clang-3.1      clang-3.1
         macports-clang-3.2      clang-3.2
         macports-clang-3.3      clang-3.3
+        macports-dragonegg-3.0  dragonegg-3.0
+        macports-dragonegg-3.1  dragonegg-3.1
+        macports-dragonegg-3.2  dragonegg-3.2
+        macports-dragonegg-3.3  dragonegg-3.3
 }
 
 # internal function to determine the default compiler
@@ -701,6 +709,50 @@
                 cxx  { set ret ${prefix}/bin/clang++-mp-3.3 }
             }
         }
+        macports-dragonegg-3.0 {
+            switch -exact ${type} {
+                cc   { set ret ${prefix}/bin/dragonegg-3.0-gcc }
+                objc { set ret ${prefix}/bin/dragonegg-3.0-gcc }
+                cxx  { set ret ${prefix}/bin/dragonegg-3.0-g++ }
+                cpp  { set ret ${prefix}/bin/dragonegg-3.0-cpp }
+                fc   { set ret ${prefix}/bin/dragonegg-3.0-gfortran }
+                f77  { set ret ${prefix}/bin/dragonegg-3.0-gfortran }
+                f90  { set ret ${prefix}/bin/dragonegg-3.0-gfortran }
+            }
+        }
+        macports-dragonegg-3.1 {
+            switch -exact ${type} {
+                cc   { set ret ${prefix}/bin/dragonegg-3.1-gcc }
+                objc { set ret ${prefix}/bin/dragonegg-3.1-gcc }
+                cxx  { set ret ${prefix}/bin/dragonegg-3.1-g++ }
+                cpp  { set ret ${prefix}/bin/dragonegg-3.1-cpp }
+                fc   { set ret ${prefix}/bin/dragonegg-3.1-gfortran }
+                f77  { set ret ${prefix}/bin/dragonegg-3.1-gfortran }
+                f90  { set ret ${prefix}/bin/dragonegg-3.1-gfortran }
+            }
+        }
+        macports-dragonegg-3.2 {
+            switch -exact ${type} {
+                cc   { set ret ${prefix}/bin/dragonegg-3.2-gcc }
+                objc { set ret ${prefix}/bin/dragonegg-3.2-gcc }
+                cxx  { set ret ${prefix}/bin/dragonegg-3.2-g++ }
+                cpp  { set ret ${prefix}/bin/dragonegg-3.2-cpp }
+                fc   { set ret ${prefix}/bin/dragonegg-3.2-gfortran }
+                f77  { set ret ${prefix}/bin/dragonegg-3.2-gfortran }
+                f90  { set ret ${prefix}/bin/dragonegg-3.2-gfortran }
+            }
+        }
+        macports-dragonegg-3.3 {
+            switch -exact ${type} {
+                cc   { set ret ${prefix}/bin/dragonegg-3.3-gcc }
+                objc { set ret ${prefix}/bin/dragonegg-3.3-gcc }
+                cxx  { set ret ${prefix}/bin/dragonegg-3.3-g++ }
+                cpp  { set ret ${prefix}/bin/dragonegg-3.3-cpp }
+                fc   { set ret ${prefix}/bin/dragonegg-3.3-gfortran }
+                f77  { set ret ${prefix}/bin/dragonegg-3.3-gfortran }
+                f90  { set ret ${prefix}/bin/dragonegg-3.3-gfortran }
+            }
+        }
     }
     return $ret
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130129/762bbb5a/attachment.html>


More information about the macports-changes mailing list