[59800] trunk/dports/math/atlas/Portfile

[jameskyle at macports.org]

Revision: 59800
          http://trac.macports.org/changeset/59800
Author:   jameskyle at macports.org
Date:     2009-10-22 13:05:20 -0700 (Thu, 22 Oct 2009)
Log Message:
-----------
Re-enabled the universal variant then override it with a warning that a universal binary is not built.

Modified Paths:
--------------
    trunk/dports/math/atlas/Portfile

Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile	2009-10-22 18:53:55 UTC (rev 59799)
+++ trunk/dports/math/atlas/Portfile	2009-10-22 20:05:20 UTC (rev 59800)
@@ -51,8 +51,6 @@
                     port:bzip2 \
                     port:gzip
 
-universal_variant   no
-
 # Set fortran compiler flags
 set myf77           ${prefix}/bin/gfortran-mp-4.3
 
@@ -72,18 +70,21 @@
                     -C sk ${prefix}/bin/gcc-mp-4.3 \
                     --cc=${prefix}/bin/gcc-mp-4.3 \
                     -b ${my_arch} \
-                    -Fa alg -fPIC 
-                    
+                    -Fa alg -fPIC
+
 configure.compiler macports-gcc-4.3
 
-        
 
+
 # we are configuring from the build directory
 configure.dir       ${workpath}/${name}-${version}/build
 configure.cmd       ../configure
 
 # change the default compilers to those of gcc43 and make into shared library
 
+variant universal description {universal variant is not currently supported in atlas} {
+  ui_msg "Atlas does not currently support the universal variant. Your default arch will be used instead."
+}
 extract {
     # extract atlas and move to a consistent working directory name
     system "cd ${workpath} && bunzip2 -dc ${distpath}/${atlasdist} | \
@@ -113,17 +114,17 @@
     ui_debug "Assembled Command: '${configure.cmd} ${configure.args}"
     system "cd ${atlas_path}/temp && \
             ${configure.cmd} ${configure.args}"
-    
-    # Get the F77FLAGS 
+
+    # Get the F77FLAGS
     set atlas_f77    [join [lrange [split [exec grep "F77 = " $atlas_path/temp/Make.inc     ] =] 1 end] =]
     ui_debug "Found atlas F77: ${atlas_f77}"
-    
+
     set atlas_fflags [join [lrange [split [exec grep "F77FLAGS = " $atlas_path/temp/Make.inc] =] 1 end] =]
     ui_debug "Found atlas F77FLAGS: ${atlas_fflags}"
-    
+
     ui_debug "Remove the old test configure directory"
     file delete -force ${atlas_path}/temp
-    
+
     # compile lapack
     system "cd ${workpath}/${lapackname}-${lapackversion} && \
             cp INSTALL/make.inc.gfortran make.inc"
@@ -131,23 +132,23 @@
            ${workpath}/${lapackname}-${lapackversion}/make.inc
     reinplace "s|OPTS     = -O2|OPTS = ${atlas_fflags}|" \
            ${workpath}/${lapackname}-${lapackversion}/make.inc
-    
+
     reinplace "s|NOOPT    = -O0|NOOPT = -O2 -m${my_arch}|" \
            ${workpath}/${lapackname}-${lapackversion}/make.inc
 
     reinplace "s|PLAT = _LINUX|PLAT = _darwin|" \
            ${workpath}/${lapackname}-${lapackversion}/make.inc
-    
+
     reinplace "s|LOADOPTS =|LOADOPTS = ${atlas_fflags}|" \
            ${workpath}/${lapackname}-${lapackversion}/make.inc
-    
+
     system "cd ${workpath}/${lapackname}-${lapackversion} && make lib"
 
     # create a build directory for atlas
     file mkdir ${workpath}/${name}-${version}/build
 
 
-    configure.args-append --with-netlib-lapack=${workpath}/${lapackname}-${lapackversion}/lapack_darwin.a 
+    configure.args-append --with-netlib-lapack=${workpath}/${lapackname}-${lapackversion}/lapack_darwin.a
 }
 
 post-configure {
@@ -175,19 +176,19 @@
         set myarch "i386"
       }
     }
-  
+
   set ld "ld -arch ${myarch} -dynamic -dylib -single_module -dead_strip -x \
           -all_load -L. -L${prefix}/lib/gcc43 -ldylib1.o -dylib_install_name"
-  
+
   system "cd ${workpath}/${name}-${version}/build/lib && \
           ${ld} ${prefix}/lib/libatlas.dylib libatlas.a -o libatlas.dylib \
            -lSystem"
-  
+
   system "cd ${workpath}/${name}-${version}/build/lib && \
           ${ld} ${prefix}/lib/libptcblas.dylib libptcblas.a -o \
            libptcblas.dylib -latlas \
            -lSystem"
-  
+
   system "cd ${workpath}/${name}-${version}/build/lib && \
           ${ld} ${prefix}/lib/libptf77blas.dylib \
           libptf77blas.a -o libptf77blas.dylib \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091022/7ce77b1e/attachment.html>