Ticket #32669: numpy-gcc46.diff
File numpy-gcc46.diff, 2.0 KB (added by miles@…, 13 years ago) |
---|
-
Portfile
old new 62 62 # compiler; if not, either use what the user set (as +gcc4X) or 63 63 # default to gcc44. 64 64 65 variant gcc43 conflicts gcc44 gcc45 \65 variant gcc43 conflicts gcc44 gcc45 gcc46 \ 66 66 description {Use the gcc43 compiler (enables fortran linking)} { 67 67 configure.compiler macports-gcc-4.3 68 68 } 69 69 70 variant gcc44 conflicts gcc43 gcc45 \70 variant gcc44 conflicts gcc43 gcc45 gcc46 \ 71 71 description {Use the gcc44 compiler (enables fortran linking)} { 72 72 configure.compiler macports-gcc-4.4 73 73 } 74 74 75 variant gcc45 conflicts gcc43 gcc44 \75 variant gcc45 conflicts gcc43 gcc44 gcc46 \ 76 76 description {Use the gcc45 compiler (enables fortran linking)} { 77 77 configure.compiler macports-gcc-4.5 78 78 } 79 79 80 if {![variant_isset gcc43] && ![variant_isset gcc45]} { 80 variant gcc46 conflicts gcc43 gcc44 gcc45 \ 81 description {Use the gcc46 compiler (enables fortran linking)} { 82 configure.compiler macports-gcc-4.6 83 } 84 85 86 if {![variant_isset gcc43] && ![variant_isset gcc45] && ![variant_isset gcc46]} { 81 87 default_variants +gcc44 82 88 } 83 89 if {[variant_isset gcc43]} { … … 86 92 set gcc_version "4.4" 87 93 } elseif {[variant_isset gcc45]} { 88 94 set gcc_version "4.5" 89 } 95 } elseif {[variant_isset gcc46]} { 96 set gcc_version "4.6" 97 } 98 90 99 91 100 # when using non-Apple GCC for universal install, it can 92 101 # create binaries only for the native OS architecture, at … … 144 153 set CC "${prefix}/bin/gcc-mp-4.5" 145 154 set CXX "${prefix}/bin/g++-mp-4.5" 146 155 set F90 "${prefix}/bin/gfortran-mp-4.5" 156 } elseif {[variant_isset gcc46]} { 157 set CC "${prefix}/bin/gcc-mp-4.6" 158 set CXX "${prefix}/bin/g++-mp-4.6" 159 set F90 "${prefix}/bin/gfortran-mp-4.6" 147 160 } 148 161 149 162 reinplace "s|@@@|${CC}|" ${worksrcpath}/c-wrapper