[59617] trunk/dports/python/py26-scipy/Portfile

[jameskyle at macports.org]

Revision: 59617
          http://trac.macports.org/changeset/59617
Author:   jameskyle at macports.org
Date:     2009-10-17 15:56:19 -0700 (Sat, 17 Oct 2009)
Log Message:
-----------
Added proper deletion of default opts for no_gcc43 and no_atlas variants.

Modified Paths:
--------------
    trunk/dports/python/py26-scipy/Portfile

Modified: trunk/dports/python/py26-scipy/Portfile
===================================================================
--- trunk/dports/python/py26-scipy/Portfile	2009-10-17 22:56:16 UTC (rev 59616)
+++ trunk/dports/python/py26-scipy/Portfile	2009-10-17 22:56:19 UTC (rev 59617)
@@ -23,19 +23,20 @@
 depends_lib-append      port:py26-numpy \
                         port:py26-nose \
                         port:SuiteSparse \
-                        bin:swig:swig
+                        bin:swig:swig \
+                        port:atlas
 
 worksrcdir              ${distname}
 
-
-build.env-append        ATLAS=${prefix}/lib \
+build.env-append        CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
+                        ATLAS=${prefix}/lib \
                         LAPACK=${prefix}/lib \
-                        BLAS=${prefix}/lib \
-                        CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
-                        CC="${prefix}/bin/gcc-mp-4.3" \
-                        CXX="${prefix}/bin/g++-mp-4.3"
+                        BLAS=${prefix}/lib
                         
-                        
+destroot.env-append     CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
+                        ATLAS=${prefix}/lib \
+                        LAPACK=${prefix}/lib \
+                        BLAS=${prefix}/lib
 
 #pre-fetch {
 #  if {![llength [glob -nocomplain ${prefix}/share/swig/*/python/python.swg]]} {
@@ -50,20 +51,39 @@
   reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
 }
 
+variant no_atlas description {"Do not use macports atlas libraries"} {
+    depends_lib-delete      port:atlas 
+    
+    build.env-delete        ATLAS=${prefix}/lib \
+                            LAPACK=${prefix}/lib \
+                            BLAS=${prefix}/lib
+
+    destroot.env-delete     ATLAS=${prefix}/lib \
+                            LAPACK=${prefix}/lib \
+                            BLAS=${prefix}/lib
+}
+
 variant gcc42 conflicts gcc43 gcc44 description "Use gfortran-mp-4.2 as fortran compiler" {
   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}
+                
+  
 }
 
-variant gcc43 conflicts gcc42 gcc44 description "Use gfortran-mp-4.3 as fortran compiler" {
+variant gcc43 conflicts gcc42 gcc44 description "Use gcc 4.3 tool chain for building" {
   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"
   build.cmd-append      ${fc_options} ${config_options}
   destroot.cmd-append   ${fc_options} ${config_options}
   
+  destroot.env-append   CC="${prefix}/bin/gcc-mp-4.3" \
+                        CXX="${prefix}/bin/g++-mp-4.3"
+  build.env-append      CC="${prefix}/bin/gcc-mp-4.3" \
+                        CXX="${prefix}/bin/g++-mp-4.3"
+  
 }
 
 variant gcc44 conflicts gcc42 gcc43 description "Use gfortran-mp-4.4 as fortran compiler" {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091017/23aebdb8/attachment-0001.html>