summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2010-03-03 12:32:09 +0000
committerDirkjan Ochtman <djc@gentoo.org>2010-03-03 12:32:09 +0000
commitafb5189fc9bb8106e37a8c48a1e26a05ebb24256 (patch)
tree7a3ab77abb7a2e040aa9b881347a9c28f874a501 /dev-util/boost-build/files
parentstable x86, bug 306333 (diff)
downloadgentoo-2-afb5189fc9bb8106e37a8c48a1e26a05ebb24256.tar.gz
gentoo-2-afb5189fc9bb8106e37a8c48a1e26a05ebb24256.tar.bz2
gentoo-2-afb5189fc9bb8106e37a8c48a1e26a05ebb24256.zip
Version bump dev-util/boost-build to 1.42.0.
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/boost-build/files')
-rw-r--r--dev-util/boost-build/files/boost-1.42-fix-mpich2-detection.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/dev-util/boost-build/files/boost-1.42-fix-mpich2-detection.patch b/dev-util/boost-build/files/boost-1.42-fix-mpich2-detection.patch
new file mode 100644
index 000000000000..d3bd646a8ebb
--- /dev/null
+++ b/dev-util/boost-build/files/boost-1.42-fix-mpich2-detection.patch
@@ -0,0 +1,35 @@
+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 ;
+ }
+