[129986] trunk/dports/devel/boost/Portfile

[sean at macports.org]

Revision: 129986
          https://trac.macports.org/changeset/129986
Author:   sean at macports.org
Date:     2014-12-23 16:42:41 -0800 (Tue, 23 Dec 2014)
Log Message:
-----------
boost: restore mpi portgroup; fixes #46156

Previously removed r125939, the correct fix is to just remove the gcc
compilers.

Revision Links:
--------------
    https://trac.macports.org/changeset/125939

Modified Paths:
--------------
    trunk/dports/devel/boost/Portfile

Modified: trunk/dports/devel/boost/Portfile
===================================================================
--- trunk/dports/devel/boost/Portfile	2014-12-24 00:42:39 UTC (rev 129985)
+++ trunk/dports/devel/boost/Portfile	2014-12-24 00:42:41 UTC (rev 129986)
@@ -3,6 +3,7 @@
 
 PortSystem      1.0
 PortGroup       compiler_blacklist_versions 1.0
+PortGroup       mpi 1.0
 
 name            boost
 version         1.56.0
@@ -76,6 +77,9 @@
 # (https://trac.macports.org/ticket/38157)
 compiler.blacklist {clang < 421} macports-clang-2.9 macports-clang-3.0 *llvm-gcc-4.2 *gcc-4.0 gcc-3.3
 
+compilers.choose   cc cxx
+mpi.setup          -gcc -dragonegg
+
 # It turns out that ccache and distcc can produce boost libraries that, although they
 # compile without warning, have all sorts of runtime errors especially with pointer corruption.
 # Since most people will now use MacPorts' pre-compiled boost, this should not be a problem.
@@ -255,6 +259,39 @@
     }
 }
 
+if {[mpi_variant_isset]} {
+
+    # There is a conflict with debug support.
+    # The issue has been reported to both the MacPorts team and the boost team, as per:
+    # <http://trac.macports.org/ticket/23667> and <https://svn.boost.org/trac/boost/ticket/4461>
+    if {[variant_isset debug]} {
+        return -code error "+debug variant conflicts with mpi"
+    }
+
+    configure.args-delete   --without-libraries=mpi
+
+    post-configure {
+        write_jam "using mpi : ${mpi.cxx} : : ${mpi.exec} ;"
+    }
+
+    if {![catch python_dir]} {
+
+        patchfiles-append patch-libs-mpi-build-Jamfile.v2.diff
+
+        post-destroot {
+            set site_packages [python_dir]
+            xinstall -d ${destroot}${site_packages}/boost
+            xinstall -m 644 ${worksrcpath}/libs/mpi/build/__init__.py \
+                ${destroot}${site_packages}/boost
+
+            set l ${site_packages}/boost/mpi.so
+            move ${destroot}${prefix}/lib/mpi.so ${destroot}${l}
+            system "install_name_tool -id ${l} ${destroot}${l}"
+        }
+
+    }
+}
+
 if {![variant_isset universal]} {
     # Honour 'build_arch', if not universal as per #28327
     if {[lsearch ${build_arch} ppc*] != -1} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141223/0dc62dde/attachment.html>