Ticket #25562: miriad-5.diff

ports/science/miriad/Portfile

@@ -48 +48 @@
 }
 
 # We need Fortran support, which the Apple version of GCC doesn't offer.
-# So we force the use of a specified MacPorts-built GCC.
+# So we force the use of a specified MacPorts-built GCC. Some users want
+# to build with better-optimizing proprietary compilers, which we allow
+# via the gcc_select mechanism.
 
-variant gcc43 conflicts gcc44 description {build with gcc 4.3} {}
-variant gcc44 conflicts gcc43 description {build with gcc 4.4} {}
+variant gcc43 conflicts gcc44 gccselect description {build with gcc 4.3} {}
+variant gcc44 conflicts gcc43 gccselect description {build with gcc 4.4} {}
+variant gccselect conflicts gcc43 gcc44 \
+    description {build with compilers chosen via gcc_select - experts only} {}
 
 if {[variant_isset gcc43]} {
     set compilerport  gcc43
     set compilerident macports-gcc-4.3
+} elseif {[variant_isset gccselect]} {
+    set compilerport  gcc_select
+    set compilerident use-gcc-select
 } else {
     set compilerport  gcc44
     set compilerident macports-gcc-4.4
@@ -92 +99 @@
 configure.args  --bindir=${prefix}/libexec/miriad \
                 --with-telescope=${thescope} \
                 --disable-docs
-configure.compiler ${compilerident}
+
+if {${compilerident} != "use-gcc-select"} {
+    configure.compiler ${compilerident}
+} else {
+    # Setting the compiler to vanilla "gcc" prevents MacPorts from
+    # trying to get fancy with the flags, which probably won't work
+    # with the user's special compiler.
+    configure.compiler gcc
+    configure.cc  "${prefix}/bin/gcc"
+    configure.cpp "${prefix}/bin/cpp"
+    configure.cxx "${prefix}/bin/g++"
+    configure.f77 "${prefix}/bin/gfortran"
+    configure.fc  "${prefix}/bin/gfortran"
+    configure.f90 "${prefix}/bin/gfortran"
+}
 
 # The telescope configuration is important, so make sure the user is
 # told which setup is being used.