commit 086b139de97070383ae24494f907961db875729e
Author: Peter Williams <peter@newton.cx>
Date: Mon Jan 24 19:41:49 2011 -0800
Allow and default to GCC 4.5.
diff --git a/ports/science/miriad/Portfile b/ports/science/miriad/Portfile
index c29d343..aed288c 100644
a
|
b
|
if {[variant_isset carma]} { |
52 | 52 | # to build with better-optimizing proprietary compilers, which we allow |
53 | 53 | # via the gcc_select mechanism. |
54 | 54 | |
55 | | variant gcc43 conflicts gcc44 gcc_select description {Build with gcc 4.3} { |
56 | | configure.compiler macports-gcc-4.3 |
57 | | depends_lib-append port:gcc43 |
| 55 | variant gcc45 conflicts gcc44 gcc_select description {Build with gcc 4.5} { |
| 56 | configure.compiler macports-gcc-4.5 |
| 57 | depends_lib-append port:gcc45 |
58 | 58 | } |
59 | 59 | |
60 | | variant gcc44 conflicts gcc43 gcc_select description {Build with gcc 4.4} { |
| 60 | variant gcc44 conflicts gcc45 gcc_select description {Build with gcc 4.4} { |
61 | 61 | configure.compiler macports-gcc-4.4 |
62 | 62 | depends_lib-append port:gcc44 |
63 | 63 | } |
64 | 64 | |
65 | | variant gcc_select conflicts gcc43 gcc44 description {Build with compilers chosen via gcc_select -- experts only} { |
| 65 | variant gcc_select conflicts gcc45 gcc44 description {Build with compilers chosen via gcc_select -- experts only} { |
66 | 66 | # Setting the compiler to vanilla "gcc" prevents MacPorts from |
67 | 67 | # trying to get fancy with the flags, which probably won't work |
68 | 68 | # with the user's special compiler. |
… |
… |
variant gcc_select conflicts gcc43 gcc44 description {Build with compilers chose |
76 | 76 | depends_lib-append port:gcc_select |
77 | 77 | } |
78 | 78 | |
79 | | if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc_select]} { |
80 | | default_variants +gcc44 |
| 79 | if {![variant_isset gcc45] && ![variant_isset gcc44] && ![variant_isset gcc_select]} { |
| 80 | default_variants +gcc45 |
81 | 81 | } |
82 | 82 | |
83 | 83 | universal_variant no |