[gentoo-commits] gentoo-x86 commit in dev-util/boost-build/files: boost-1.41-fix-mpich2-detection.patch

[gentoo-commits] gentoo-x86 commit in dev-util/boost-build/files: boost-1.41-fix-mpich2-detection.patch

[Dirkjan Ochtman (djc)]

djc         09/12/02 15:25:01

  Added:                boost-1.41-fix-mpich2-detection.patch
  Log:
  Version bump dev-util/boost-build to 1.41.0.
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-util/boost-build/files/boost-1.41-fix-mpich2-detection.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/boost-build/files/boost-1.41-fix-mpich2-detection.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/boost-build/files/boost-1.41-fix-mpich2-detection.patch?rev=1.1&content-type=text/plain

Index: boost-1.41-fix-mpich2-detection.patch
===================================================================
Index: tools/build/v2/tools/mpi.jam
===================================================================
--- tools/build/v2/tools/mpi.jam        (revision 57744)
+++ tools/build/v2/tools/mpi.jam        (working copy)
@@ -156,14 +156,27 @@
         # into a feature.
         local match = [ MATCH "^(-.)(.*)" : $(cmdline) ] ;
         local matched ;
-        if $(match) && $(match[2]) {
+        if $(match) && $(match[2]) {
            local prefix = $(match[1]) ;
            if $(feature_kinds$(prefix)) {
                local name = $(feature_kinds$(prefix)) ;
                local add = [ add_feature $(prefix) $(name) $(cmdline) ] ;

                if $(add) {
-                  result += $(add[1]) ;
+
+                  if $(add[1]) = <find-shared-library>pthread
+                  {
+                      # Uhm. It's not really nice that this MPI implementation
+                      # uses -lpthread as opposed to -pthread. We do want to
+                      # set <threading>multi, instead of -lpthread.
+                      result += "<threading>multi" ;
+                      MPI_EXTRA_REQUIREMENTS += "<threading>multi" ;
+                  }
+                  else
+                  {
+                      result += $(add[1]) ;
+                  }
+
                   cmdline = $(add[2]) ;
                   matched = yes ;
                }