[gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/, sys-cluster/openmpi/files/

[gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/, sys-cluster/openmpi/files/

[Christoph Junghans]

commit:     aa2d8270717cbcfd7fa6f244fcda56c1eff53923
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 17 02:41:22 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 02:41:22 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=aa2d8270

added fortran workaround and missing patch

Package-Manager: portage-2.2.14

---
 sys-cluster/openmpi/ChangeLog                |  4 ++
 sys-cluster/openmpi/files/openmpi-ltdl.patch | 78 ++++++++++++++++++++++++++++
 sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild  |  2 +-
 3 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 3885ff3..33e1bdf 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +files/openmpi-ltdl.patch,
+  openmpi-1.8.4-r2.ebuild:
+  added fortran workaround and missing patch
+
 *openmpi-1.8.4-r2 (17 Feb 2015)
 
   17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +openmpi-1.8.4-r2.ebuild:

diff --git a/sys-cluster/openmpi/files/openmpi-ltdl.patch b/sys-cluster/openmpi/files/openmpi-ltdl.patch
new file mode 100644
index 0000000..a288ea2
--- /dev/null
+++ b/sys-cluster/openmpi/files/openmpi-ltdl.patch
@@ -0,0 +1,78 @@
+diff -up openmpi-1.6.3/ompi/debuggers/dlopen_test.c.ltdl openmpi-1.6.3/ompi/debuggers/dlopen_test.c
+--- openmpi-1.6.3/ompi/debuggers/dlopen_test.c.ltdl	2012-04-03 08:30:25.000000000 -0600
++++ openmpi-1.6.3/ompi/debuggers/dlopen_test.c	2012-11-02 14:50:12.613702426 -0600
+@@ -13,7 +13,17 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#include "opal/libltdl/ltdl.h"
++#if OPAL_WANT_LIBLTDL
++  #ifndef __WINDOWS__
++    #if OPAL_LIBLTDL_INTERNAL
++      #include "opal/libltdl/ltdl.h"
++    #else
++      #include "ltdl.h"
++    #endif
++  #else
++    #include "ltdl.h"
++  #endif
++#endif
+ 
+ static int do_test(void);
+ 
+diff -up openmpi-1.6.3/ompi/debuggers/Makefile.am.ltdl openmpi-1.6.3/ompi/debuggers/Makefile.am
+--- openmpi-1.6.3/ompi/debuggers/Makefile.am.ltdl	2012-04-03 08:30:25.000000000 -0600
++++ openmpi-1.6.3/ompi/debuggers/Makefile.am	2012-11-02 15:04:53.636926260 -0600
+@@ -47,7 +47,7 @@ headers = \
+ 
+ dlopen_test_SOURCES = dlopen_test.c
+ dlopen_test_CPPFLAGS = -I$(top_srcdir)/opal/libltdl
+-dlopen_test_LDADD = $(top_builddir)/opal/libltdl/libltdlc.la
++dlopen_test_LDADD = $(LIBLTDL)
+ 
+ predefined_gap_test_SOURCES = predefined_gap_test.c
+ predefined_gap_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
+diff -up openmpi-1.6.3/test/support/components.c.ltdl openmpi-1.6.3/test/support/components.c
+--- openmpi-1.6.3/test/support/components.c.ltdl	2012-04-03 08:29:44.000000000 -0600
++++ openmpi-1.6.3/test/support/components.c	2012-11-02 14:50:29.204705380 -0600
+@@ -24,7 +24,17 @@
+ 
+ #include "opal/constants.h"
+ #include "opal/mca/mca.h"
+-#include "opal/libltdl/ltdl.h"
++#if OPAL_WANT_LIBLTDL
++  #ifndef __WINDOWS__
++    #if OPAL_LIBLTDL_INTERNAL
++      #include "opal/libltdl/ltdl.h"
++    #else
++      #include "ltdl.h"
++    #endif
++  #else
++    #include "ltdl.h"
++  #endif
++#endif
+ 
+ #include "components.h"
+ 
+diff -up openmpi-1.6.3/test/support/components.h.ltdl openmpi-1.6.3/test/support/components.h
+--- openmpi-1.6.3/test/support/components.h.ltdl	2012-04-03 08:29:44.000000000 -0600
++++ openmpi-1.6.3/test/support/components.h	2012-11-02 14:50:22.409703519 -0600
+@@ -20,7 +20,17 @@
+ #ifndef OMPI_SUPPORT_COMPONENTS_H
+ #define OMPI_SUPPORT_COMPONENTS_H
+ 
+-#include "opal/libltdl/ltdl.h"
++#if OPAL_WANT_LIBLTDL
++  #ifndef __WINDOWS__
++    #if OPAL_LIBLTDL_INTERNAL
++      #include "opal/libltdl/ltdl.h"
++    #else
++      #include "ltdl.h"
++    #endif
++  #else
++    #include "ltdl.h"
++  #endif
++#endif
+ #include "opal/mca/mca.h"
+ 
+ BEGIN_C_DECLS

diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild
index 5aed96c..ce6c5a4 100644
--- a/sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild
@@ -131,7 +131,7 @@ multilib_src_configure() {
 			--enable-opal-multi-threads)
 	fi
 
-	if use fortran; then
+	if multilib_is_native_abi && use fortran; then
 		myconf+=(--enable-mpi-fortran=all)
 	else
 		myconf+=(--enable-mpi-fortran=no)