Updates to allow OMPI to build on Cray XT platforms running Catamount

This commit was SVN r22381.

contrib/platform/redstorm

@@ -1,4 +1,4 @@
-enable_io_romio=yes
+enable_visibility=no
 enable_static=yes
 enable_shared=no
 with_threads=no

opal/util/if.c

@@ -1420,10 +1420,11 @@ opal_iffinalize(void)
     return OPAL_SUCCESS;
 }
 
-uint32_t
-opal_iftupletoaddr(char *addr)
+int
+opal_iftupletoaddr(char *inaddr, uint32_t *net, uint32_t *mask)
 {
     return 0;
 }
+
 #endif /* HAVE_STRUCT_SOCKADDR_IN */
 

orte/config/orte_configure_options.m4

@@ -38,7 +38,7 @@ AC_ARG_WITH([rte-support],
 if test "$with_rte_support" = "no"; then
     AC_MSG_RESULT([no])
     orte_without_full_support=1
-    list_of_frameworks="errmgr,ess-singleton,ess-hnp,ess-tool,ess-env,filem,grpcomm-basic,grpcomm-bad,iof,odls,oob,plm,ras,rmaps,rml,routed,snapc,btl-sm,coll-sm,common-sm,mpool-sm,dpm-orte,pubsub-orte"
+    list_of_frameworks="errmgr,ess-singleton,ess-hnp,ess-tool,ess-env,filem,grpcomm-basic,grpcomm-bad,iof,odls,oob,plm,ras,rmaps,rml,routed,snapc,btl-sm,coll-sm,common-sm,mpool-sm,dpm-orte,pubsub-orte,rmcast,routed"
     if test -z $enable_mca_no_build ; then
       enable_mca_no_build="$list_of_frameworks"
     else

orte/mca/rmcast/rmcast.h

@@ -29,6 +29,12 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
 
 #include "opal/mca/mca.h"
 #include "opal/dss/dss_types.h"

orte/runtime/orte_globals.h

@@ -71,6 +71,10 @@ ORTE_DECLSPEC extern orte_process_name_t orte_name_invalid;  /** instantiated in
    param */
 ORTE_DECLSPEC extern bool orte_in_parallel_debugger;
 
+/* error manager callback function */
+typedef void (*orte_err_cb_fn_t)(orte_process_name_t *proc, orte_proc_state_t state, void *cbdata);
+
+typedef uint16_t orte_mapping_policy_t;
 
 #if ORTE_DISABLE_FULL_SUPPORT
 
@@ -281,7 +285,6 @@ typedef uint8_t orte_job_controls_t;
 #define ORTE_JOB_CONTROL_FORWARD_COMM       0x20
 #define ORTE_JOB_CONTROL_CONTINUOUS_OP      0x40
 
-typedef uint16_t orte_mapping_policy_t;
 #define ORTE_MAPPING_POLICY OPAL_UINT16
 /* put the rank assignment method in the upper 8 bits */
 #define ORTE_MAPPING_NOPOL          0x0100
@@ -330,9 +333,6 @@ typedef uint16_t orte_mapping_policy_t;
 #define ORTE_BINDING_NOT_REQUIRED(n) \
     (ORTE_BIND_IF_SUPPORTED & (n))
 
-/* error manager callback function */
-typedef void (*orte_err_cb_fn_t)(orte_process_name_t *proc, orte_proc_state_t state, void *cbdata);
-
 typedef struct {
     /** Base object so this can be put on a list */
     opal_list_item_t super;