Revision

74597

Author

ram@macports.org

Date

2010-12-22 12:43:15 -0800 (Wed, 22 Dec 2010)

Log Message

python/p2{5,6,7}-scipy: handle compiler variants consistently

Modified Paths

• trunk/dports/python/py25-scipy/Portfile
• trunk/dports/python/py26-scipy/Portfile
• trunk/dports/python/py27-scipy/Portfile

Diff

--- trunk/dports/python/py25-scipy/Portfile	2010-12-22 19:03:16 UTC (rev 74596)
+++ trunk/dports/python/py25-scipy/Portfile	2010-12-22 20:43:15 UTC (rev 74597)
@@ -63,14 +63,22 @@
                             BLAS=${prefix}/lib
 }
 
-variant gcc42 conflicts gcc43 gcc44 description "Use gfortran-mp-4.2 as fortran compiler" {
+variant gcc42 conflicts gcc43 gcc44 description "Use gcc 4.2 tool chain for building" {
+  configure.compiler    macports-gcc-4.2
   depends_lib-append    port:gcc42
   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
+  set config_options    "config --cc ${prefix}/bin/gcc-mp-4.2 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
+  build.cmd-append      ${fc_options} ${config_options}
+  destroot.cmd-append   ${fc_options} ${config_options}
+
+  destroot.env-append   CC="${prefix}/bin/gcc-mp-4.2" \
+                        CXX="${prefix}/bin/g++-mp-4.2"
+  build.env-append      CC="${prefix}/bin/gcc-mp-4.2" \
+                        CXX="${prefix}/bin/g++-mp-4.2"
 }
 
 variant gcc43 conflicts gcc42 gcc44 description "Use gcc 4.3 tool chain for building" {
+  configure.compiler    macports-gcc-4.3
   depends_lib-append    port:gcc43
   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
   set config_options    "config --cc ${prefix}/bin/gcc-mp-4.3 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
@@ -84,10 +92,17 @@
 }
 
 variant gcc44 conflicts gcc42 gcc43 description "Use gfortran-mp-4.4 as fortran compiler" {
+  configure.compiler    macports-gcc-4.4
   depends_lib-append    port:gcc44
   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.4 --f90exec ${prefix}/bin/gfortran-mp-4.4"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
+  set config_options    "config --cc ${prefix}/bin/gcc-mp-4.4 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
+  build.cmd-append      ${fc_options} ${config_options}
+  destroot.cmd-append   ${fc_options} ${config_options}
+
+  destroot.env-append   CC="${prefix}/bin/gcc-mp-4.4" \
+                        CXX="${prefix}/bin/g++-mp-4.4"
+  build.env-append      CC="${prefix}/bin/gcc-mp-4.4" \
+                        CXX="${prefix}/bin/g++-mp-4.4"
 }
 
 if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {

--- trunk/dports/python/py26-scipy/Portfile	2010-12-22 19:03:16 UTC (rev 74596)
+++ trunk/dports/python/py26-scipy/Portfile	2010-12-22 20:43:15 UTC (rev 74597)
@@ -55,12 +55,18 @@
                             BLAS=${prefix}/lib
 }
 
-variant gcc42 conflicts gcc43 gcc44 description "Use gfortran-mp-4.2 as fortran compiler" {
+variant gcc42 conflicts gcc43 gcc44 description "Use gcc 4.2 tool chain for building" {
   configure.compiler    macports-gcc-4.2
   depends_lib-append    port:gcc42
   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
+  set config_options    "config --cc ${prefix}/bin/gcc-mp-4.2 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
+  build.cmd-append      ${fc_options} ${config_options}
+  destroot.cmd-append   ${fc_options} ${config_options}
+
+  destroot.env-append   CC="${prefix}/bin/gcc-mp-4.2" \
+                        CXX="${prefix}/bin/g++-mp-4.2"
+  build.env-append      CC="${prefix}/bin/gcc-mp-4.2" \
+                        CXX="${prefix}/bin/g++-mp-4.2"
 }
 
 variant gcc43 conflicts gcc42 gcc44 description "Use gcc 4.3 tool chain for building" {
@@ -81,8 +87,14 @@
   configure.compiler    macports-gcc-4.4
   depends_lib-append    port:gcc44
   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.4 --f90exec ${prefix}/bin/gfortran-mp-4.4"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
+  set config_options    "config --cc ${prefix}/bin/gcc-mp-4.4 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
+  build.cmd-append      ${fc_options} ${config_options}
+  destroot.cmd-append   ${fc_options} ${config_options}
+
+  destroot.env-append   CC="${prefix}/bin/gcc-mp-4.4" \
+                        CXX="${prefix}/bin/g++-mp-4.4"
+  build.env-append      CC="${prefix}/bin/gcc-mp-4.4" \
+                        CXX="${prefix}/bin/g++-mp-4.4"
 }
 
 if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {

--- trunk/dports/python/py27-scipy/Portfile	2010-12-22 19:03:16 UTC (rev 74596)
+++ trunk/dports/python/py27-scipy/Portfile	2010-12-22 20:43:15 UTC (rev 74597)
@@ -55,12 +55,18 @@
                             BLAS=${prefix}/lib
 }
 
-variant gcc42 conflicts gcc43 gcc44 description "Use gfortran-mp-4.2 as fortran compiler" {
+variant gcc42 conflicts gcc43 gcc44 description "Use gcc 4.2 tool chain for building" {
   configure.compiler    macports-gcc-4.2
   depends_lib-append    port:gcc42
   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
+  set config_options    "config --cc ${prefix}/bin/gcc-mp-4.2 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
+  build.cmd-append      ${fc_options} ${config_options}
+  destroot.cmd-append   ${fc_options} ${config_options}
+
+  destroot.env-append   CC="${prefix}/bin/gcc-mp-4.2" \
+                        CXX="${prefix}/bin/g++-mp-4.2"
+  build.env-append      CC="${prefix}/bin/gcc-mp-4.2" \
+                        CXX="${prefix}/bin/g++-mp-4.2"
 }
 
 variant gcc43 conflicts gcc42 gcc44 description "Use gcc 4.3 tool chain for building" {
@@ -81,8 +87,14 @@
   configure.compiler    macports-gcc-4.4
   depends_lib-append    port:gcc44
   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.4 --f90exec ${prefix}/bin/gfortran-mp-4.4"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
+  set config_options    "config --cc ${prefix}/bin/gcc-mp-4.4 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
+  build.cmd-append      ${fc_options} ${config_options}
+  destroot.cmd-append   ${fc_options} ${config_options}
+
+  destroot.env-append   CC="${prefix}/bin/gcc-mp-4.4" \
+                        CXX="${prefix}/bin/g++-mp-4.4"
+  build.env-append      CC="${prefix}/bin/gcc-mp-4.4" \
+                        CXX="${prefix}/bin/g++-mp-4.4"
 }
 
 if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {