commit 6baa50d3c86e495b778c939aabafbaae69ab3251
Author: Peter Williams <peter@newton.cx>
Date: Sun Feb 24 13:57:23 2013 -0800
Portfile: support gcc 4.7, and default to using it
diff --git a/ports/science/miriad/Portfile b/ports/science/miriad/Portfile
index 2b06587..5315548 100644
a
|
b
|
if {[variant_isset carma]} { |
58 | 58 | # to build with better-optimizing proprietary compilers, which we allow |
59 | 59 | # via the gcc_select mechanism. |
60 | 60 | |
61 | | variant gcc44 conflicts gcc45 gcc46 gcc_select description {Build with gcc/gfortran 4.4} { |
62 | | configure.compiler macports-gcc-4.4 |
63 | | depends_lib-append port:gcc44 |
64 | | } |
65 | | |
66 | | variant gcc45 conflicts gcc44 gcc46 gcc_select description {Build with gcc/gfortran 4.5} { |
| 61 | variant gcc45 conflicts gcc46 gcc47 gcc_select description {Build with gcc/gfortran 4.5} { |
67 | 62 | configure.compiler macports-gcc-4.5 |
68 | 63 | depends_lib-append port:gcc45 |
69 | 64 | } |
70 | 65 | |
71 | | variant gcc46 conflicts gcc44 gcc45 gcc_select description {Build with gcc/gfortran 4.6} { |
| 66 | variant gcc46 conflicts gcc45 gcc47 gcc_select description {Build with gcc/gfortran 4.6} { |
72 | 67 | configure.compiler macports-gcc-4.6 |
73 | 68 | depends_lib-append port:gcc46 |
74 | 69 | } |
75 | 70 | |
76 | | variant gcc_select conflicts gcc44 gcc45 gcc46 description {Build with compilers chosen via gcc_select -- experts only} { |
| 71 | variant gcc47 conflicts gcc45 gcc46 gcc_select description {Build with gcc/gfortran 4.7} { |
| 72 | configure.compiler macports-gcc-4.7 |
| 73 | depends_lib-append port:gcc47 |
| 74 | } |
| 75 | |
| 76 | variant gcc_select conflicts gcc45 gcc46 gcc47 description {Build with compilers chosen via gcc_select -- experts only} { |
77 | 77 | configure.compiler macports-gcc |
78 | 78 | depends_lib-append port:gcc_select |
79 | 79 | } |
80 | 80 | |
81 | | if {![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc_select]} { |
82 | | default_variants +gcc45 |
| 81 | if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset gcc_select]} { |
| 82 | default_variants +gcc47 |
83 | 83 | } |
84 | 84 | |
85 | 85 | universal_variant no |