[77007] trunk/dports/math/eigen3/Portfile

[eborisch at macports.org]

Revision: 77007
          http://trac.macports.org/changeset/77007
Author:   eborisch at macports.org
Date:     2011-03-17 14:49:14 -0700 (Thu, 17 Mar 2011)
Log Message:
-----------
eigen3: Enable universal libeigen_blas* builds

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

Modified: trunk/dports/math/eigen3/Portfile
===================================================================
--- trunk/dports/math/eigen3/Portfile	2011-03-17 21:12:31 UTC (rev 77006)
+++ trunk/dports/math/eigen3/Portfile	2011-03-17 21:49:14 UTC (rev 77007)
@@ -5,7 +5,7 @@
 
 name                eigen3
 version             3.0-rc1
-revision            1
+revision            2
 license             {{GPL-2+} {LGPL-3+}}
 categories          math science
 maintainers         eborisch \
@@ -23,16 +23,15 @@
                     sha1    b212964117c856c7b8a8118ae1f11550aa59d53c \
                     rmd160  a6617b380e8fc0f89c7209279098059d2c8a44ce
 
+universal_variant   yes
+configure.universal_args  ""
+
 # Variants
-variant llvm description { Enable llvm-g++ for 'port test' target.} requires configured conflicts gcc44 gcc45 {
-  configure.compiler  llvm-gcc-4.2
-}
-
-variant gcc44 description { Use MacPort's gcc44 compilers } conflicts gcc45 llvm {
+variant gcc44 description { Use MacPort's gcc44 compilers } conflicts gcc45 {
   configure.compiler  macports-gcc-4.4
 }
 
-variant gcc45 description { Use MacPort's gcc44 compilers } conflicts gcc44 llvm {
+variant gcc45 description { Use MacPort's gcc45 compilers } conflicts gcc44 {
   configure.compiler  macports-gcc-4.5
 }
 
@@ -61,28 +60,39 @@
 }
 
 # Install licenses and documentation (if +doc)
-post-destroot {
-  set docdir ${destroot}${prefix}/share/doc/${name}
-  xinstall -d ${docdir}
-  xinstall -m 644 -W ${workpath}/eigen_src COPYING.GPL COPYING.LGPL ${docdir}
- 
-  # Install documentation if requested
-  if {[variant_isset doc]} {
-    file copy ${worksrcpath}/doc/html ${docdir}
+pre-destroot {
+  set build_suffix {}
+  if {![info exists universal_archs_to_use]} {
+    lappend build_suffix ""
+  } else {
+    set dash "-"
+    foreach arch ${universal_archs_to_use} {
+      lappend build_suffix ${dash}${arch}
+    }
   }
 
-  if {[variant_isset blas]} {
-    set libdir ${destroot}${prefix}/lib
-    xinstall -d ${libdir}
-    eval file copy [glob ${worksrcpath}/blas/libeigen_blas*] ${libdir}
+  foreach sfx ${build_suffix} {
+    set docdir ${destroot}${sfx}${prefix}/share/doc/${name}
+    xinstall -d ${docdir}
+    xinstall -m 644 -W ${workpath}/eigen_src COPYING.GPL COPYING.LGPL ${docdir}
+   
+    # Install documentation if requested
+    if {[variant_isset doc]} {
+      file copy ${worksrcpath}${sfx}/doc/html ${docdir}
+    }
+
+    if {[variant_isset blas]} {
+        set libdir ${destroot}${sfx}${prefix}/lib
+        xinstall -d ${libdir}
+        eval file copy [glob ${worksrcpath}${sfx}/blas/libeigen_blas*] ${libdir}
+    }
   }
 }
 
+
 # Are we doing a header-only or configured (for 'port test' or +doc/+blas) build?
 if {![variant_isset configured]} {
   # We can skip everything and just copy the headers -- fast!
-  # Just headers so noarch
-  supported_archs     noarch
   use_configure       no
   build {}
   destroot {
@@ -98,6 +108,7 @@
     ui_error "!!! TESTING IS UNSUPPORTED WITHOUT +configured VARIANT !!!"
   }
 } else {
+  PortGroup           muniversal 1.0
   # Not using cmake portgroup as it sets -DCMAKE_OSX_ARCHITECTURES
   # in a way we don't seem to be able disable.
   set cmake_share_module_dir ${prefix}/share/cmake/modules
@@ -128,9 +139,6 @@
 
   # Enable parallel builds
   build.env-append    EIGEN_MAKE_ARGS=-j{build.jobs}
-
-  # Binaries don't actually get installed; just test on default architecture
-  universal_variant   no
 }
 
 livecheck.type        regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110317/f2e29647/attachment-0001.html>