Import OpenMPI 1.4 as parallel/openmpi.

OpenMPI is open source MPI-2 implementation.

11 files changed, 430 insertions, 0 deletions

diff --git a/parallel/openmpi/patches/patch-aa b/parallel/openmpi/patches/patch-aa
new file mode 100644
index 00000000000..10bcc72d104
--- /dev/null
+++ b/parallel/openmpi/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+
+Missing RPATH support.
+
+--- opal/tools/wrappers/opal_wrapper.c.orig	2008-08-25 23:16:48.000000000 +0400
++++ opal/tools/wrappers/opal_wrapper.c	2008-09-04 11:41:17.000000000 +0400
+@@ -57,6 +57,7 @@
+ #if !defined(__WINDOWS__)
+ #define OPAL_INCLUDE_FLAG  "-I"
+ #define OPAL_LIBDIR_FLAG   "-L"
++#define OPAL_RPATH_FLAG    "-R"
+ #else
+ #define OPAL_INCLUDE_FLAG  "/I"
+ #define OPAL_LIBDIR_FLAG   "/LIBPATH:"
+@@ -301,6 +302,8 @@
+ #else
+             asprintf(&line, OPAL_LIBDIR_FLAG"%s", 
+                      options_data[parse_options_idx].path_libdir);
++            asprintf(&line, OPAL_RPATH_FLAG"%s", 
++                     options_data[parse_options_idx].path_libdir);
+ #endif  /* defined(__WINDOWS__) */
+             opal_argv_append_nosize(&options_data[parse_options_idx].link_flags, line);
+             free(line);
diff --git a/parallel/openmpi/patches/patch-ab b/parallel/openmpi/patches/patch-ab
new file mode 100644
index 00000000000..9d59443edb7
--- /dev/null
+++ b/parallel/openmpi/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+
+Force our libltdl.
+
+--- opal/Makefile.in.orig	2009-01-19 20:24:00.000000000 +0300
++++ opal/Makefile.in	2009-02-05 13:23:01.000000000 +0300
+@@ -568,7 +568,7 @@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBLTDL = @LIBLTDL@
+-LIBLTDL_SUBDIR = @LIBLTDL_SUBDIR@
++LIBLTDL_SUBDIR =
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/parallel/openmpi/patches/patch-ac b/parallel/openmpi/patches/patch-ac
new file mode 100644
index 00000000000..4e71ac06953
--- /dev/null
+++ b/parallel/openmpi/patches/patch-ac
@@ -0,0 +1,28 @@
+$NetBSD: patch-ac,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+
+Force our libltdl.
+
+--- configure.orig	2009-01-19 20:23:17.000000000 +0300
++++ configure	2009-02-06 01:59:45.000000000 +0300
+@@ -163871,9 +163871,10 @@
+   "") enable_ltdl_convenience=yes
+       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+ esac
+-LIBLTDL='${top_build_prefix}'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
++#LIBLTDL='${top_build_prefix}'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
++#LIBLTDL=libltdl.la
+ LTDLDEPS=$LIBLTDL
+-LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
++#LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
+ 
+ 
+ 
+@@ -180176,7 +180177,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <opal/libltdl/ltdl.h>
++#include <ltdl.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
diff --git a/parallel/openmpi/patches/patch-ad b/parallel/openmpi/patches/patch-ad
new file mode 100644
index 00000000000..068f949ded0
--- /dev/null
+++ b/parallel/openmpi/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+
+Force our libltdl.
+
+--- opal/mca/base/mca_base_component_find.c.orig	2009-10-21 04:05:57.000000000 +0400
++++ opal/mca/base/mca_base_component_find.c	2009-10-27 11:46:51.000000000 +0300
+@@ -41,11 +41,7 @@
+ #endif
+ 
+ #if OMPI_WANT_LIBLTDL
+-  #ifndef __WINDOWS__ 
+-    #include "opal/libltdl/ltdl.h" 
+-  #else 
+     #include "ltdl.h" 
+-  #endif 
+ #endif
+ 
+ #include "opal/util/output.h"
diff --git a/parallel/openmpi/patches/patch-ae b/parallel/openmpi/patches/patch-ae
new file mode 100644
index 00000000000..4067c5e7da3
--- /dev/null
+++ b/parallel/openmpi/patches/patch-ae
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+
+Force our libltdl.
+
+--- opal/mca/base/mca_base_component_repository.c.orig	2009-10-21 04:05:57.000000000 +0400
++++ opal/mca/base/mca_base_component_repository.c	2009-10-27 11:47:50.000000000 +0300
+@@ -27,11 +27,7 @@
+ #include <stdio.h>
+ 
+ #if OMPI_WANT_LIBLTDL
+-  #ifndef __WINDOWS__ 
+-    #include "opal/libltdl/ltdl.h" 
+-  #else 
+     #include "ltdl.h" 
+-  #endif 
+ #endif
+ 
+ #include "opal/class/opal_list.h"
diff --git a/parallel/openmpi/patches/patch-af b/parallel/openmpi/patches/patch-af
new file mode 100644
index 00000000000..4085637c9de
--- /dev/null
+++ b/parallel/openmpi/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+
+Force our libltdl.
+
+--- test/support/components.h.orig	2008-11-04 23:56:21.000000000 +0300
++++ test/support/components.h	2009-02-15 04:08:24.000000000 +0300
+@@ -20,7 +20,7 @@
+ #ifndef OMPI_SUPPORT_COMPONENTS_H
+ #define OMPI_SUPPORT_COMPONENTS_H
+ 
+-#include "opal/libltdl/ltdl.h"
++#include "ltdl.h"
+ #include "opal/mca/mca.h"
+ 
+ #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/parallel/openmpi/patches/patch-ag b/parallel/openmpi/patches/patch-ag
new file mode 100644
index 00000000000..dd39ea7a0d0
--- /dev/null
+++ b/parallel/openmpi/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+
+Force our libltdl.
+
+--- test/support/components.c.orig	2008-11-04 23:56:21.000000000 +0300
++++ test/support/components.c	2009-02-15 04:08:30.000000000 +0300
+@@ -23,7 +23,7 @@
+ #include "ompi/constants.h"
+ #include "opal/constants.h"
+ #include "opal/mca/mca.h"
+-#include "opal/libltdl/ltdl.h"
++#include "ltdl.h"
+ 
+ #include "components.h"
+ 
diff --git a/parallel/openmpi/patches/patch-ah b/parallel/openmpi/patches/patch-ah
new file mode 100644
index 00000000000..ff603615f22
--- /dev/null
+++ b/parallel/openmpi/patches/patch-ah
@@ -0,0 +1,174 @@
+$NetBSD: patch-ah,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+
+Rewrite network interface configuration using getifaddrs(3) for BSD,
+this should fix OpenMPI for NetBSD. By Kevin M. Buckley.
+
+--- opal/util/if.c.orig	2009-12-08 23:36:09.000000000 +0300
++++ opal/util/if.c	2009-12-13 00:06:38.000000000 +0300
+@@ -38,6 +38,9 @@
+ #endif
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
++#if defined(__DragonFly__)
++#define IN_LINKLOCAL(i)        (((u_int32_t)(i) & 0xffff0000) == 0xa9fe0000)
++#endif
+ #endif
+ #ifdef HAVE_ARPA_INET_H
+ #include <arpa/inet.h>
+@@ -164,6 +167,145 @@
+                                 false, false, (int)false, &sd);
+     do_not_resolve = OPAL_INT_TO_BOOL(sd);
+ 
++#if defined(__NetBSD__) || defined(__FreeBSD__) || \
++    defined(__OpenBSD__) || defined(__DragonFly__)
++    /* configure using getifaddrs(3) */
++    {
++        OBJ_CONSTRUCT(&opal_if_list, opal_list_t);
++
++        struct ifaddrs **ifadd_list;
++        struct ifaddrs *cur_ifaddrs;
++        struct sockaddr_in* sin_addr;
++
++        /* 
++         * the manpage claims that getifaddrs() allocates the memory,
++         * and freeifaddrs() is later used to release the allocated memory.
++         * however, without this malloc the call to getifaddrs() segfaults
++         */
++        ifadd_list = (struct ifaddrs **) malloc(sizeof(struct ifaddrs*));
++
++        /* create the linked list of ifaddrs structs */
++        if(getifaddrs(ifadd_list) < 0) {
++            opal_output(0, "opal_ifinit: getifaddrs() failed with error=%d\n",
++                    errno);
++            return OPAL_ERROR;
++        }
++
++        for(cur_ifaddrs = *ifadd_list; NULL != cur_ifaddrs; 
++                cur_ifaddrs = cur_ifaddrs->ifa_next) {
++
++            opal_if_t intf;
++            opal_if_t *intf_ptr;
++            struct in_addr a4;
++
++#if 0
++	    printf("interface %s.\n", cur_ifaddrs->ifa_name);
++#endif
++            /* skip non- af_inet interface addresses */
++            if(AF_INET != cur_ifaddrs->ifa_addr->sa_family) {
++#if 0
++	      printf("skipping non- af_inet interface %s, family %d.\n",
++		     cur_ifaddrs->ifa_name, cur_ifaddrs->ifa_addr->sa_family);
++#endif
++		continue;
++	    }
++
++            /* skip interface if it is down (IFF_UP not set) */
++            if(0 == (cur_ifaddrs->ifa_flags & IFF_UP)) {
++#if 0
++                printf("skipping non-up interface %s.\n", cur_ifaddrs->ifa_name);
++#endif
++                continue;
++            }
++
++            /* skip interface if it is a loopback device (IFF_LOOPBACK set) */
++            /* or if it is a point-to-point interface */
++            /* TODO: do we really skip p2p? */
++            if(0 != (cur_ifaddrs->ifa_flags & IFF_LOOPBACK)
++                    || 0!= (cur_ifaddrs->ifa_flags & IFF_POINTOPOINT)) {
++#if 0
++                printf("skipping loopback interface %s.\n", cur_ifaddrs->ifa_name);
++#endif              
++                continue;
++            }
++
++#if 0
++	    printf("sa_len %d.\n", cur_ifaddrs->ifa_addr->sa_len);
++#endif
++            sin_addr = (struct sockaddr_in *) cur_ifaddrs->ifa_addr;
++
++	    /* Do we really need to skip link-local addresses? */
++#if 0
++            /* skip link local address: */
++            if(IN_LINKLOCAL (htonl(((struct sockaddr_in*)cur_ifaddrs->ifa_addr)->sin_addr.s_addr))) {
++#if 0
++                opal_output(0, "opal_ifinit: skipping link-local ip address on interface %s.\n",
++                        cur_ifaddrs->ifa_name);
++#endif
++                continue;
++            }
++#endif
++
++            memset(&intf, 0, sizeof(intf));
++            OBJ_CONSTRUCT(&intf, opal_list_item_t);
++#if 0 
++            char *addr_name = (char *) malloc(48*sizeof(char));
++            inet_ntop(AF_INET, &sin_addr->sin_addr, addr_name, 48*sizeof(char));
++            opal_output(0, "inet capable interface %s discovered, address %s.\n", 
++                    cur_ifaddrs->ifa_name, addr_name);
++            free(addr_name);
++#endif
++
++            /* fill values into the opal_if_t */
++            memcpy(&a4, &(sin_addr->sin_addr), sizeof(struct in_addr));
++            
++            strncpy(intf.if_name, cur_ifaddrs->ifa_name, IF_NAMESIZE);
++            intf.if_index = opal_list_get_size(&opal_if_list) + 1;
++            ((struct sockaddr_in*) &intf.if_addr)->sin_addr = a4;
++            ((struct sockaddr_in*) &intf.if_addr)->sin_family = AF_INET;
++            ((struct sockaddr_in*) &intf.if_addr)->sin_len =  cur_ifaddrs->ifa_addr->sa_len;
++
++            /* since every scope != 0 is ignored, we just set the scope to 0 */
++            /* There's no scope_id in the non-ipv6 stuff 
++	    ((struct sockaddr_in6*) &intf.if_addr)->sin6_scope_id = 0; 
++	    */
++
++            /*
++             * hardcoded netmask, adrian says that's ok
++             */
++	    /* Non-NetBSD uses intf.if_mask = prefix(((struct sockaddr_in*) &ifr->ifr_addr)->sin_addr.s_addr); */
++            /* intf.if_mask = 64; */
++	    intf.if_mask = prefix( sin_addr->sin_addr.s_addr);
++            intf.if_flags = cur_ifaddrs->ifa_flags;
++
++            /*
++             * FIXME: figure out how to gain access to the kernel index
++             * (or create our own), getifaddrs() does not contain such
++             * data
++             */
++
++            intf.if_kernel_index = (uint16_t) if_nametoindex(cur_ifaddrs->ifa_name);
++
++            intf_ptr = (opal_if_t*) calloc(1, sizeof(opal_if_t));
++            if(NULL == intf_ptr) {
++                opal_output(0, "opal_ifinit: unable to allocate %lu bytes\n",
++                            sizeof(opal_if_t));
++                OBJ_DESTRUCT(&intf);
++                return OPAL_ERR_OUT_OF_RESOURCE;
++            }
++            memcpy(intf_ptr, &intf, sizeof(intf));
++
++#if 0
++            printf("About to append interface %s.\n", cur_ifaddrs->ifa_name);
++#endif
++	    /* opal_list_append(&opal_if_list, &intf_ptr->super); */
++            opal_list_append(&opal_if_list, (opal_list_item_t*) intf_ptr);
++
++            OBJ_DESTRUCT(&intf);
++        }   /*  of for loop over ifaddrs list */
++
++    }
++#else
+     /* create the internet socket to test off */
+ /*
+    Change AF_INET to AF_UNSPEC (or AF_INET6) and everything will fail.
+@@ -356,6 +498,10 @@
+     }
+     free(ifconf.ifc_req);
+     close(sd);
++
++#endif /* anything other than {Net,Open,Free}BSD and DragonFly */
++
++
+ #if OPAL_WANT_IPV6
+ #ifdef __linux__ /* Linux does not have SIOCGL*, so parse
+                      /proc/net/if_inet6 instead */
diff --git a/parallel/openmpi/patches/patch-ai b/parallel/openmpi/patches/patch-ai
new file mode 100644
index 00000000000..b56ec992f00
--- /dev/null
+++ b/parallel/openmpi/patches/patch-ai
@@ -0,0 +1,39 @@
+$NetBSD: patch-ai,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+
+Install configuration files into example directory.
+
+--- orte/etc/Makefile.in.orig	2009-11-11 17:04:47.000000000 +0300
++++ orte/etc/Makefile.in	2009-12-04 05:00:13.000000000 +0300
+@@ -899,6 +899,7 @@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
++exampledir = $(pkgdatadir)/examples
+ target_alias = @target_alias@
+ timer_aix_LIBS = @timer_aix_LIBS@
+ top_build_prefix = @top_build_prefix@
+@@ -1086,19 +1087,19 @@
+ # details why the mkdir is in install-data-local.
+ 
+ install-data-local:
+-	$(mkdir_p) $(DESTDIR)$(sysconfdir)
++	$(mkdir_p) $(DESTDIR)$(exampledir)
+ 	@ p="$(orte_config_files)"; \
+ 	for file in $$p; do \
+-	  if test -f $(DESTDIR)$(sysconfdir)/$$file; then \
++	  if test -f $(DESTDIR)$(exampledir)/$$file; then \
+ 	    echo "******************************* WARNING ************************************"; \
+ 	    echo "*** Not installing new $$file over existing file in:"; \
+-	    echo "***   $(DESTDIR)$(sysconfdir)/$$file"; \
++	    echo "***   $(DESTDIR)$(exampledir)/$$file"; \
+ 	    echo "******************************* WARNING ************************************"; \
+ 	  else \
+ 	    if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
+ 	    f="`echo $$file | sed -e 's|^.*/||'`"; \
+-	    echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f"; \
+-	    $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f; \
++	    echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(exampledir)/$$f"; \
++	    $(INSTALL_DATA) $$d$$file $(DESTDIR)$(exampledir)/$$f; \
+ 	  fi; \
+ 	done
+ 
diff --git a/parallel/openmpi/patches/patch-aj b/parallel/openmpi/patches/patch-aj
new file mode 100644
index 00000000000..2898bbd4d90
--- /dev/null
+++ b/parallel/openmpi/patches/patch-aj
@@ -0,0 +1,46 @@
+$NetBSD: patch-aj,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+
+Install configuration files into example directory.
+
+--- opal/etc/Makefile.in.orig	2009-11-11 17:04:16.000000000 +0300
++++ opal/etc/Makefile.in	2009-12-04 04:33:04.000000000 +0300
+@@ -36,6 +36,7 @@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++exampledir = $(pkgdatadir)/examples
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -1085,24 +1086,24 @@
+ # details why the mkdir is in install-data-local.
+ 
+ install-data-local:
+-	$(mkdir_p) $(DESTDIR)$(sysconfdir)
++	$(mkdir_p) $(DESTDIR)$(exampledir)
+ 	@ p="$(opal_config_files)"; \
+         if test "$(opal_file_from_platform)" = "yes"; then \
+ 	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	    echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/openmpi-mca-params.conf"; \
+-	    $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/openmpi-mca-params.conf; \
++	    echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(exampledir)/openmpi-mca-params.conf"; \
++	    $(INSTALL_DATA) $$d$$p $(DESTDIR)$(exampledir)/openmpi-mca-params.conf; \
+         else \
+             for file in $$p; do \
+-	        if test -f $(DESTDIR)$(sysconfdir)/openmpi-mca-params.conf; then \
++	        if test -f $(DESTDIR)$(exampledir)/openmpi-mca-params.conf; then \
+ 	            echo "******************************* WARNING ************************************"; \
+ 	            echo "*** Not installing new $$file over existing file in:"; \
+-	            echo "***   $(DESTDIR)$(sysconfdir)/$$file"; \
++	            echo "***   $(DESTDIR)$(exampledir)/$$file"; \
+ 	            echo "******************************* WARNING ************************************"; \
+ 	        else \
+ 	            if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
+ 	            f="`echo $$file | sed -e 's|^.*/||'`"; \
+-	            echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f"; \
+-	            $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f; \
++	            echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(exampledir)/$$f"; \
++	            $(INSTALL_DATA) $$d$$file $(DESTDIR)$(exampledir)/$$f; \
+ 	        fi; \
+ 	    done \
+         fi;
diff --git a/parallel/openmpi/patches/patch-ak b/parallel/openmpi/patches/patch-ak
new file mode 100644
index 00000000000..2e39bb51c05
--- /dev/null
+++ b/parallel/openmpi/patches/patch-ak
@@ -0,0 +1,39 @@
+$NetBSD: patch-ak,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+
+Install configuration files into example directory.
+
+--- ompi/etc/Makefile.in.orig	2009-12-04 04:54:39.000000000 +0300
++++ ompi/etc/Makefile.in	2009-12-04 05:02:08.000000000 +0300
+@@ -36,6 +36,7 @@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++exampledir = $(pkgdatadir)/examples
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -1086,19 +1087,19 @@
+ # details why the mkdir is in install-data-local.
+ 
+ install-data-local:
+-	$(mkdir_p) $(DESTDIR)$(sysconfdir)
++	$(mkdir_p) $(DESTDIR)$(exampledir)
+ 	@ p="$(ompi_config_files)"; \
+ 	for file in $$p; do \
+-	  if test -f $(DESTDIR)$(sysconfdir)/$$file; then \
++	  if test -f $(DESTDIR)$(exampledir)/$$file; then \
+ 	    echo "******************************* WARNING ************************************"; \
+ 	    echo "*** Not installing new $$file over existing file in:"; \
+-	    echo "***   $(DESTDIR)$(sysconfdir)/$$file"; \
++	    echo "***   $(DESTDIR)$(exampledir)/$$file"; \
+ 	    echo "******************************* WARNING ************************************"; \
+ 	  else \
+ 	    if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
+ 	    f="`echo $$file | sed -e 's|^.*/||'`"; \
+-	    echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f"; \
+-	    $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f; \
++	    echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(exampledir)/$$f"; \
++	    $(INSTALL_DATA) $$d$$file $(DESTDIR)$(exampledir)/$$f; \
+ 	  fi; \
+ 	done
+