Ticket #48269: Portfile-atlas.diff
File Portfile-atlas.diff, 2.5 KB (added by Schamschula (Marius Schamschula), 9 years ago) |
---|
-
Portfile
old new 57 57 set gcc_version 0 58 58 set use_clang "" 59 59 60 variant gcc49 conflicts gcc47 gcc48 clang mpclang34 perf\ 60 variant gcc5 conflicts gcc47 gcc48 gcc49 clang mpclang34 perf\ 61 description {build using macports-gcc-4.9} { 62 63 configure.compiler macports-gcc-5 64 } 65 66 if {[variant_isset gcc5]} { 67 68 set gcc_version 5 69 set use_clang "" 70 71 } 72 73 variant gcc49 conflicts gcc47 gcc48 gcc5 clang mpclang34 perf\ 61 74 description {build using macports-gcc-4.9} { 62 75 63 76 configure.compiler macports-gcc-4.9 … … 70 83 71 84 } 72 85 73 variant gcc48 conflicts gcc47 gcc49 clang mpclang34 perf \86 variant gcc48 conflicts gcc47 gcc49 gcc5 clang mpclang34 perf \ 74 87 description {build using macports-gcc-4.8} { 75 88 76 89 configure.compiler macports-gcc-4.8 … … 82 95 set use_clang "" 83 96 } 84 97 85 variant gcc47 conflicts gcc48 gcc49 clang mpclang34 perf \98 variant gcc47 conflicts gcc48 gcc49 gcc5 clang mpclang34 perf \ 86 99 description {build using macports-gcc-4.7} { 87 100 88 101 configure.compiler macports-gcc-4.7 … … 95 108 } 96 109 97 110 98 variant clang conflicts gcc47 gcc48 gcc49 mpclang34 \111 variant clang conflicts gcc47 gcc48 gcc49 gcc5 mpclang34 \ 99 112 description {use XCode clang and gfortran} { 100 113 101 114 pre-fetch { … … 114 127 set gcc_version 0 115 128 } 116 129 117 variant mpclang34 conflicts gcc47 gcc48 gcc49 clang perf\130 variant mpclang34 conflicts gcc47 gcc48 gcc49 gcc5 clang perf\ 118 131 description {use mp-clang-3.4 and gfortran} { 119 132 120 133 configure.compiler macports-clang-3.4 … … 126 139 set gcc_version 0 127 140 } 128 141 129 variant perf conflicts gcc47 gcc48 gcc49 mpclang34 clang \142 variant perf conflicts gcc47 gcc48 gcc49 gcc5 mpclang34 clang \ 130 143 description {Uses clang-mp-3.4 for C and dragonegg-3.4 for Fortran} { 131 144 132 145 if {[vercmp ${xcodeversion} 5.0] < 0} { … … 189 202 # up to SSE4.2 (Core i1) capable processors, and XCode-clang for newer 190 203 191 204 if {![variant_isset gcc47] && ![variant_isset gcc48] && \ 192 ![variant_isset gcc49] && ![variant_isset clang] && \ 193 ![variant_isset perf] && ![variant_isset mpclang34]} { 205 ![variant_isset gcc49] && ![variant_isset gcc5] && \ 206 ![variant_isset clang] && ![variant_isset perf] && \ 207 ![variant_isset mpclang34]} { 194 208 195 209 if {${has_avx} == "no"} { 196 210