Ticket #40316: Portfile.patch
File Portfile.patch, 1.9 KB (added by ds283 (David Seery), 11 years ago) |
---|
-
Portfile
old new 86 86 87 87 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9} 88 88 set default_fortran_variant +gcc48 89 set g95_conflicts {} 89 set g95_conflicts {ifort} 90 set ifort_conflicts {g95} 90 91 91 92 foreach ver ${gcc_versions} { 92 93 set ver_no_dot [join [split ${ver} "."] ""] 93 94 94 set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95 }95 set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95 ifort} 95 96 96 97 foreach over ${gcc_versions} { 97 98 if {${ver} == ${over}} { … … 106 107 eval $variant_line 107 108 108 109 append g95_conflicts " conflicts gcc${ver_no_dot}" 110 append ifort_conflicts " conflicts gcc${ver_no_dot}" 109 111 110 112 if {[variant_isset gcc${ver_no_dot}]} { 111 113 if {${default_fortran_variant} != "+gcc${ver_no_dot}"} { … … 116 118 117 119 eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}] 118 120 121 eval [concat {variant ifort description {build with Intel IFORT}} $ifort_conflicts {{}}] 122 119 123 if {[variant_isset g95]} { 120 124 if {${default_fortran_variant} != "+g95"} { 121 125 set default_fortran_variant "" 122 126 } 123 127 } 124 128 129 if {[variant_isset ifort]} { 130 if {${default_fortran_variant} != "+ifort"} { 131 set default_fortran_variant "" 132 } 133 } 134 125 135 if {${default_fortran_variant} != ""} { 126 136 default_variants "${default_fortran_variant}" 127 137 } … … 148 158 configure.f90 ${prefix}/bin/g95 149 159 } 150 160 161 if {[variant_isset ifort]} { 162 configure.fc /usr/bin/ifort 163 configure.f77 /usr/bin/ifort 164 configure.f90 /usr/bin/ifort 165 } 166 151 167 livecheck.type regex 152 168 livecheck.url http://www.open-mpi.org/software/ompi/v1.7/ 153 169 livecheck.regex openmpi-(\[0-9\.\]+).tar.bz2