Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel In directory sc8-pr-cvs17:/tmp/cvs-serv20941
Modified Files: openmpi.info openmpi.patch Log Message: New version 1.2.2 from tracker Index: openmpi.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/openmpi.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- openmpi.patch 28 May 2007 14:23:35 -0000 1.1 +++ openmpi.patch 8 Jun 2007 18:32:26 -0000 1.2 @@ -1,81 +1,71 @@ -diff -uNr openmpi-1.1.5/ompi/communicator/comm_dyn.c openmpi-1.1.5.environ/ompi/communicator/comm_dyn.c ---- openmpi-1.1.5/ompi/communicator/comm_dyn.c 2007-05-27 20:27:37.000000000 -0400 -+++ openmpi-1.1.5.environ/ompi/communicator/comm_dyn.c 2007-05-27 20:25:55.000000000 -0400 -@@ -51,7 +51,12 @@ - +diff -uNr openmpi-1.2.2/ompi/communicator/comm_dyn.c openmpi-1.2.2.environ/ompi/communicator/comm_dyn.c +--- openmpi-1.2.2/ompi/communicator/comm_dyn.c 2007-01-24 13:16:09.000000000 -0500 ++++ openmpi-1.2.2.environ/ompi/communicator/comm_dyn.c 2007-05-28 16:08:20.000000000 -0400 +@@ -59,7 +59,12 @@ #include "orte/runtime/runtime.h" + #if !defined(__WINDOWS__) +# ifdef __APPLE__ +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else extern char **environ; +# endif + #endif /* !defined(__WINDOWS__) */ - int ompi_comm_connect_accept ( ompi_communicator_t *comm, int root, - orte_process_name_t *port, int send_first, -diff -uNr openmpi-1.1.5/opal/tools/wrappers/opal_wrapper.c openmpi-1.1.5.environ/opal/tools/wrappers/opal_wrapper.c ---- openmpi-1.1.5/opal/tools/wrappers/opal_wrapper.c 2006-04-12 12:12:06.000000000 -0400 -+++ openmpi-1.1.5.environ/opal/tools/wrappers/opal_wrapper.c 2007-05-27 20:05:22.000000000 -0400 -@@ -48,7 +48,12 @@ - #include "opal/util/path.h" - #include "opal/util/few.h" - + static int ompi_comm_get_rport (orte_process_name_t *port, +diff -uNr openmpi-1.2.2/opal/mca/memory/ptmalloc2/arena.c openmpi-1.2.2.environ/opal/mca/memory/ptmalloc2/arena.c +--- openmpi-1.2.2/opal/mca/memory/ptmalloc2/arena.c 2006-11-09 13:53:28.000000000 -0500 ++++ openmpi-1.2.2.environ/opal/mca/memory/ptmalloc2/arena.c 2007-05-28 17:50:12.000000000 -0400 +@@ -293,7 +293,12 @@ + /* Initialization routine. */ + #ifdef _LIBC + #include <string.h> +# ifdef __APPLE__ +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else - extern char **environ; + extern char **_environ; +# endif - struct { - char *language; -diff -uNr openmpi-1.1.5/opal/util/opal_environ.c openmpi-1.1.5.environ/opal/util/opal_environ.c ---- openmpi-1.1.5/opal/util/opal_environ.c 2006-04-12 12:12:07.000000000 -0400 -+++ openmpi-1.1.5.environ/opal/util/opal_environ.c 2007-05-27 20:07:07.000000000 -0400 -@@ -26,7 +26,9 @@ - #include "opal/util/argv.h" - #include "opal/util/opal_environ.h" - #include "opal/constants.h" -- -+# ifdef __APPLE__ -+# include <crt_externs.h> -+# endif + static char * + internal_function +diff -uNr openmpi-1.2.2/opal/tools/wrappers/opal_wrapper.c openmpi-1.2.2.environ/opal/tools/wrappers/opal_wrapper.c +--- openmpi-1.2.2/opal/tools/wrappers/opal_wrapper.c 2007-04-19 12:30:53.000000000 -0400 ++++ openmpi-1.2.2.environ/opal/tools/wrappers/opal_wrapper.c 2007-05-28 16:09:20.000000000 -0400 +@@ -52,7 +52,12 @@ + #include "opal/util/os_path.h" - /* - * Merge two environ-like char arrays, ensuring that there are no -@@ -93,7 +95,11 @@ - int i; - char *newvalue, *compare; - size_t len; + #if !defined(__WINDOWS__) +# ifdef __APPLE__ ++# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else - extern char **environ; + extern char **environ; +# endif + #define OPAL_INCLUDE_FLAG "-I" + #define OPAL_LIBDIR_FLAG "-L" + #else +diff -uNr openmpi-1.2.2/opal/util/opal_environ.c openmpi-1.2.2.environ/opal/util/opal_environ.c +--- openmpi-1.2.2/opal/util/opal_environ.c 2007-04-19 12:30:53.000000000 -0400 ++++ openmpi-1.2.2.environ/opal/util/opal_environ.c 2007-05-28 17:43:50.000000000 -0400 +@@ -28,7 +28,12 @@ + #include "opal/constants.h" - /* Make the new value */ - -diff -uNr openmpi-1.1.5/orte/mca/pls/base/pls_base_context.c openmpi-1.1.5.environ/orte/mca/pls/base/pls_base_context.c ---- openmpi-1.1.5/orte/mca/pls/base/pls_base_context.c 2006-04-12 12:12:33.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/mca/pls/base/pls_base_context.c 2007-05-27 20:09:03.000000000 -0400 -@@ -42,7 +42,12 @@ - #include "orte/mca/pls/base/base.h" - #include "orte/mca/errmgr/errmgr.h" - + #if !defined(__WINDOWS__) +# ifdef __APPLE__ +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else - extern char **environ; + extern char** environ; +# endif + #endif /* !defined(__WINDOWS__) */ - int orte_pls_base_check_context_cwd(orte_app_context_t *context, - bool want_chdir) -diff -uNr openmpi-1.1.5/orte/mca/pls/bproc/pls_bproc.c openmpi-1.1.5.environ/orte/mca/pls/bproc/pls_bproc.c ---- openmpi-1.1.5/orte/mca/pls/bproc/pls_bproc.c 2006-09-19 04:51:59.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/mca/pls/bproc/pls_bproc.c 2007-05-27 20:09:50.000000000 -0400 -@@ -73,7 +73,12 @@ + /* +diff -uNr openmpi-1.2.2/orte/mca/pls/bproc/pls_bproc.c openmpi-1.2.2.environ/orte/mca/pls/bproc/pls_bproc.c +--- openmpi-1.2.2/orte/mca/pls/bproc/pls_bproc.c 2007-04-19 12:30:57.000000000 -0400 ++++ openmpi-1.2.2.environ/orte/mca/pls/bproc/pls_bproc.c 2007-05-28 16:10:37.000000000 -0400 +@@ -81,7 +81,12 @@ /** * Our current evironment */ @@ -86,95 +76,90 @@ extern char **environ; +# endif - #if OMPI_HAVE_POSIX_THREADS && OMPI_THREADS_HAVE_DIFFERENT_PIDS - int orte_pls_bproc_launch_threaded(orte_jobid_t); -diff -uNr openmpi-1.1.5/orte/mca/pls/fork/pls_fork_module.c openmpi-1.1.5.environ/orte/mca/pls/fork/pls_fork_module.c ---- openmpi-1.1.5/orte/mca/pls/fork/pls_fork_module.c 2006-10-10 09:58:48.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/mca/pls/fork/pls_fork_module.c 2007-05-27 20:10:35.000000000 -0400 -@@ -76,7 +76,12 @@ - #include "orte/mca/soh/base/base.h" - #include "orte/mca/pls/fork/pls_fork.h" + static bool daemons_launched; + static bool bynode; +diff -uNr openmpi-1.2.2/orte/mca/pls/gridengine/pls_gridengine_module.c openmpi-1.2.2.environ/orte/mca/pls/gridengine/pls_gridengine_module.c +--- openmpi-1.2.2/orte/mca/pls/gridengine/pls_gridengine_module.c 2007-04-19 12:30:57.000000000 -0400 ++++ openmpi-1.2.2.environ/orte/mca/pls/gridengine/pls_gridengine_module.c 2007-05-28 16:11:25.000000000 -0400 +@@ -90,7 +90,12 @@ + #include "orte/mca/pls/gridengine/pls_gridengine.h" + #if !defined(__WINDOWS__) +# ifdef __APPLE__ +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else extern char **environ; +# endif + #endif /* !defined(__WINDOWS__) */ - #if OMPI_HAVE_POSIX_THREADS && OMPI_THREADS_HAVE_DIFFERENT_PIDS && OMPI_ENABLE_PROGRESS_THREADS - static int orte_pls_fork_launch_threaded(orte_jobid_t); -diff -uNr openmpi-1.1.5/orte/mca/pls/poe/pls_poe_component.c openmpi-1.1.5.environ/orte/mca/pls/poe/pls_poe_component.c ---- openmpi-1.1.5/orte/mca/pls/poe/pls_poe_component.c 2006-04-12 12:12:33.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/mca/pls/poe/pls_poe_component.c 2007-05-27 20:12:18.000000000 -0400 -@@ -31,6 +31,9 @@ - #include "opal/util/argv.h" - #include "opal/mca/base/mca_base_param.h" + orte_pls_base_module_t orte_pls_gridengine_module = { +diff -uNr openmpi-1.2.2/orte/mca/pls/poe/pls_poe_component.c openmpi-1.2.2.environ/orte/mca/pls/poe/pls_poe_component.c +--- openmpi-1.2.2/orte/mca/pls/poe/pls_poe_component.c 2006-11-09 13:54:09.000000000 -0500 ++++ openmpi-1.2.2.environ/orte/mca/pls/poe/pls_poe_component.c 2007-05-28 16:12:09.000000000 -0400 +@@ -153,7 +153,12 @@ + } + #if !defined(__WINDOWS__) +# ifdef __APPLE__ +# include <crt_externs.h> -+# endif - - /* - * Public string showing the pls ompi_poe component version number -@@ -156,7 +159,11 @@ - */ - orte_pls_base_module_t *orte_pls_poe_component_init(int *priority) - { -+# ifdef __APPLE__ +# define environ (*_NSGetEnviron()) +# else - extern char **environ; + extern char **environ; +# endif - mca_pls_poe_component.path = opal_path_findv(mca_pls_poe_component.argv[0], 0, environ, NULL); - if (NULL == mca_pls_poe_component.path) { - return NULL; -diff -uNr openmpi-1.1.5/orte/mca/pls/poe/pls_poe_module.c openmpi-1.1.5.environ/orte/mca/pls/poe/pls_poe_module.c ---- openmpi-1.1.5/orte/mca/pls/poe/pls_poe_module.c 2006-09-19 04:51:59.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/mca/pls/poe/pls_poe_module.c 2007-05-27 20:13:12.000000000 -0400 -@@ -48,7 +48,12 @@ - #include "orte/util/session_dir.h" - #include "orte/runtime/orte_wait.h" + #endif /* !defined(__WINDOWS__) */ + + /** +diff -uNr openmpi-1.2.2/orte/mca/pls/poe/pls_poe_module.c openmpi-1.2.2.environ/orte/mca/pls/poe/pls_poe_module.c +--- openmpi-1.2.2/orte/mca/pls/poe/pls_poe_module.c 2007-02-16 13:20:49.000000000 -0500 ++++ openmpi-1.2.2.environ/orte/mca/pls/poe/pls_poe_module.c 2007-05-28 16:12:53.000000000 -0400 +@@ -56,7 +56,12 @@ + #include "orte/mca/pls/poe/pls_poe.h" + #if !defined(__WINDOWS__) +# ifdef __APPLE__ +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else extern char **environ; +# endif + #endif /* !defined(__WINDOWS__) */ /* - * Local functions -diff -uNr openmpi-1.1.5/orte/mca/pls/rsh/pls_rsh_component.c openmpi-1.1.5.environ/orte/mca/pls/rsh/pls_rsh_component.c ---- openmpi-1.1.5/orte/mca/pls/rsh/pls_rsh_component.c 2006-04-12 12:12:33.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/mca/pls/rsh/pls_rsh_component.c 2007-05-27 20:26:47.000000000 -0400 -@@ -40,7 +40,12 @@ - #include "opal/mca/base/mca_base_param.h" - #include "orte/mca/rml/rml.h" +diff -uNr openmpi-1.2.2/orte/mca/pls/rsh/pls_rsh_component.c openmpi-1.2.2.environ/orte/mca/pls/rsh/pls_rsh_component.c +--- openmpi-1.2.2/orte/mca/pls/rsh/pls_rsh_component.c 2007-01-13 21:39:47.000000000 -0500 ++++ openmpi-1.2.2.environ/orte/mca/pls/rsh/pls_rsh_component.c 2007-05-28 16:14:15.000000000 -0400 +@@ -45,7 +45,12 @@ + #include "orte/mca/pls/rsh/pls_rsh.h" + #if !defined(__WINDOWS__) +# ifdef __APPLE__ +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else extern char **environ; +# endif - + #endif /* !defined(__WINDOWS__) */ /* -@@ -169,7 +174,6 @@ +@@ -189,11 +194,6 @@ + return ORTE_SUCCESS; + } + +- +-#if !defined(__WINDOWS__) +-extern char **environ; +-#endif /* !defined(__WINDOWS__) */ +- + orte_pls_base_module_t *orte_pls_rsh_component_init(int *priority) { char *bname; - size_t i; -- extern char **environ; - - /* Take the string that was given to us by the pla_rsh_agent MCA - param and search for it */ -diff -uNr openmpi-1.1.5/orte/mca/pls/rsh/pls_rsh_module.c openmpi-1.1.5.environ/orte/mca/pls/rsh/pls_rsh_module.c ---- openmpi-1.1.5/orte/mca/pls/rsh/pls_rsh_module.c 2006-07-14 12:18:58.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/mca/pls/rsh/pls_rsh_module.c 2007-05-27 20:16:00.000000000 -0400 -@@ -84,7 +84,12 @@ +diff -uNr openmpi-1.2.2/orte/mca/pls/rsh/pls_rsh_module.c openmpi-1.2.2.environ/orte/mca/pls/rsh/pls_rsh_module.c +--- openmpi-1.2.2/orte/mca/pls/rsh/pls_rsh_module.c 2007-05-08 13:55:56.000000000 -0400 ++++ openmpi-1.2.2.environ/orte/mca/pls/rsh/pls_rsh_module.c 2007-05-28 16:15:01.000000000 -0400 +@@ -89,7 +89,12 @@ + #include "orte/mca/pls/base/pls_private.h" #include "orte/mca/pls/rsh/pls_rsh.h" - #include "orte/util/sys_info.h" +# ifdef __APPLE__ +# include <crt_externs.h> @@ -183,110 +168,117 @@ extern char **environ; +# endif - #if OMPI_HAVE_POSIX_THREADS && OMPI_THREADS_HAVE_DIFFERENT_PIDS && OMPI_ENABLE_PROGRESS_THREADS -diff -uNr openmpi-1.1.5/orte/mca/pls/slurm/pls_slurm_module.c openmpi-1.1.5.environ/orte/mca/pls/slurm/pls_slurm_module.c ---- openmpi-1.1.5/orte/mca/pls/slurm/pls_slurm_module.c 2006-07-14 12:18:58.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/mca/pls/slurm/pls_slurm_module.c 2007-05-27 20:16:51.000000000 -0400 -@@ -99,8 +99,12 @@ - /* + static int orte_pls_rsh_launch_threaded(orte_jobid_t jobid); +diff -uNr openmpi-1.2.2/orte/mca/pls/slurm/pls_slurm_module.c openmpi-1.2.2.environ/orte/mca/pls/slurm/pls_slurm_module.c +--- openmpi-1.2.2/orte/mca/pls/slurm/pls_slurm_module.c 2007-04-19 12:30:57.000000000 -0400 ++++ openmpi-1.2.2.environ/orte/mca/pls/slurm/pls_slurm_module.c 2007-05-28 16:15:54.000000000 -0400 +@@ -110,7 +110,12 @@ * External */ + #if !defined(__WINDOWS__) +# ifdef __APPLE__ +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else extern char **environ; -- +# endif + #endif /* !defined(__WINDOWS__) */ - static int pls_slurm_launch(orte_jobid_t jobid) - { -diff -uNr openmpi-1.1.5/orte/mca/pls/tm/pls_tm_module.c openmpi-1.1.5.environ/orte/mca/pls/tm/pls_tm_module.c ---- openmpi-1.1.5/orte/mca/pls/tm/pls_tm_module.c 2006-07-14 22:08:39.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/mca/pls/tm/pls_tm_module.c 2007-05-27 20:17:42.000000000 -0400 -@@ -95,7 +95,12 @@ + static int pls_slurm_launch_job(orte_jobid_t jobid) +diff -uNr openmpi-1.2.2/orte/mca/pls/tm/pls_tm_module.c openmpi-1.2.2.environ/orte/mca/pls/tm/pls_tm_module.c +--- openmpi-1.2.2/orte/mca/pls/tm/pls_tm_module.c 2007-04-19 12:30:57.000000000 -0400 ++++ openmpi-1.2.2.environ/orte/mca/pls/tm/pls_tm_module.c 2007-05-28 16:16:38.000000000 -0400 +@@ -111,7 +111,12 @@ }; - + #if !defined(__WINDOWS__) +# ifdef __APPLE__ +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else extern char **environ; +# endif + #endif /* !defined(__WINDOWS__) */ + static int pls_tm_launch_job(orte_jobid_t jobid) +diff -uNr openmpi-1.2.2/orte/mca/rmgr/base/rmgr_base_check_context.c openmpi-1.2.2.environ/orte/mca/rmgr/base/rmgr_base_check_context.c +--- openmpi-1.2.2/orte/mca/rmgr/base/rmgr_base_check_context.c 2006-11-09 13:54:04.000000000 -0500 ++++ openmpi-1.2.2.environ/orte/mca/rmgr/base/rmgr_base_check_context.c 2007-05-28 16:19:18.000000000 -0400 +@@ -47,7 +47,12 @@ + #include "orte/mca/rmgr/base/rmgr_private.h" - static int -diff -uNr openmpi-1.1.5/orte/runtime/orte_setup_hnp.c openmpi-1.1.5.environ/orte/runtime/orte_setup_hnp.c ---- openmpi-1.1.5/orte/runtime/orte_setup_hnp.c 2006-04-12 12:12:34.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/runtime/orte_setup_hnp.c 2007-05-27 20:20:07.000000000 -0400 -@@ -66,7 +66,12 @@ - #include "orte/runtime/runtime.h" + #if !defined(__WINDOWS__) ++# ifdef __APPLE__ ++# include <crt_externs.h> ++# define environ (*_NSGetEnviron()) ++# else + extern char **environ; ++# endif + #endif /* !defined(__WINDOWS__) */ + + int orte_rmgr_base_check_context_cwd(orte_app_context_t *context, +diff -uNr openmpi-1.2.2/orte/runtime/orte_setup_hnp.c openmpi-1.2.2.environ/orte/runtime/orte_setup_hnp.c +--- openmpi-1.2.2/orte/runtime/orte_setup_hnp.c 2007-01-13 21:39:47.000000000 -0500 ++++ openmpi-1.2.2.environ/orte/runtime/orte_setup_hnp.c 2007-05-28 16:20:05.000000000 -0400 +@@ -67,7 +67,12 @@ #include "orte/runtime/orte_setup_hnp.h" + #if !defined(__WINDOWS__) +# ifdef __APPLE__ +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else extern char **environ; +# endif + #endif /* !defined(__WINDOWS__) */ /* Local condition variables and mutex - */ -diff -uNr openmpi-1.1.5/orte/tools/orted/orted.c openmpi-1.1.5.environ/orte/tools/orted/orted.c ---- openmpi-1.1.5/orte/tools/orted/orted.c 2006-10-10 09:58:48.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/tools/orted/orted.c 2007-05-27 20:21:54.000000000 -0400 -@@ -69,7 +69,12 @@ - +diff -uNr openmpi-1.2.2/orte/tools/orted/orted.c openmpi-1.2.2.environ/orte/tools/orted/orted.c +--- openmpi-1.2.2/orte/tools/orted/orted.c 2007-04-19 12:30:57.000000000 -0400 ++++ openmpi-1.2.2.environ/orte/tools/orted/orted.c 2007-05-28 17:41:50.000000000 -0400 +@@ -76,7 +76,12 @@ #include "orte/tools/orted/orted.h" + #if !defined(__WINDOWS__) +# ifdef __APPLE__ +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else - extern char **environ; + extern char** environ; +# endif + #endif /* !defined(__WINDOWS__) */ - orted_globals_t orted_globals; - -@@ -172,7 +177,6 @@ - NULL, OPAL_CMD_LINE_TYPE_NULL, NULL } + /* +diff -uNr openmpi-1.2.2/orte/tools/orterun/orterun.c openmpi-1.2.2.environ/orte/tools/orterun/orterun.c +--- openmpi-1.2.2/orte/tools/orterun/orterun.c 2007-04-19 12:30:57.000000000 -0400 ++++ openmpi-1.2.2.environ/orte/tools/orterun/orterun.c 2007-05-28 17:42:54.000000000 -0400 +@@ -291,7 +291,12 @@ }; --extern char **environ; - - - int main(int argc, char *argv[]) -diff -uNr openmpi-1.1.5/orte/tools/orterun/orterun.c openmpi-1.1.5.environ/orte/tools/orterun/orterun.c ---- openmpi-1.1.5/orte/tools/orterun/orterun.c 2006-10-05 22:39:54.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/tools/orterun/orterun.c 2007-05-27 20:23:13.000000000 -0400 -@@ -74,7 +74,12 @@ - /* - * The environment - */ + #if !defined(__WINDOWS__) +# ifdef __APPLE__ +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else extern char** environ; +# endif - - /* - * Globals -diff -uNr openmpi-1.1.5/orte/tools/orterun/totalview.c openmpi-1.1.5.environ/orte/tools/orterun/totalview.c ---- openmpi-1.1.5/orte/tools/orterun/totalview.c 2006-07-14 12:21:40.000000000 -0400 -+++ openmpi-1.1.5.environ/orte/tools/orterun/totalview.c 2007-05-27 20:24:03.000000000 -0400 -@@ -52,7 +52,12 @@ + #endif /* !defined(__WINDOWS__) */ /* + * Local functions +diff -uNr openmpi-1.2.2/orte/tools/orterun/totalview.c openmpi-1.2.2.environ/orte/tools/orterun/totalview.c +--- openmpi-1.2.2/orte/tools/orterun/totalview.c 2006-11-09 13:54:10.000000000 -0500 ++++ openmpi-1.2.2.environ/orte/tools/orterun/totalview.c 2007-05-28 16:20:46.000000000 -0400 +@@ -53,7 +53,12 @@ * The environment */ + #if !defined(__WINDOWS__) +# ifdef __APPLE__ +# include <crt_externs.h> +# define environ (*_NSGetEnviron()) +# else extern char **environ; +# endif + #endif /* !defined(__WINDOWS__) */ #include "opal/util/opal_environ.h" - #include "opal/util/output.h" Index: openmpi.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/openmpi.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- openmpi.info 28 May 2007 14:23:35 -0000 1.3 +++ openmpi.info 8 Jun 2007 18:32:26 -0000 1.4 @@ -1,5 +1,5 @@ Package: openmpi -Version: 1.1.5 +Version: 1.2.2 Revision: 1000 GCC: 4.0 Description: MPI implementation for parallel computing @@ -9,12 +9,19 @@ BuildDepends: gcc42 BuildConflicts: lammpi (<< 7.1.2-1000), lammpi-shlibs (<< 7.1.2-1000), lammpi-dev Conflicts: lammpi (<< 7.1.2-1000), lammpi-shlibs (<< 7.1.2-1000), lammpi-dev (<< 7.1.2-1000) -Source: http://www.open-mpi.org/software/ompi/v1.1/downloads/openmpi-%v.tar.bz2 -Source-MD5: 6aada92896a1830ece6d3ba1e66a17fa -ConfigureParams: --prefix=%p --libexecdir=%p/lib/%n --datadir=%p/share/doc/%n --sysconfdir=%p/etc/%n --sharedstatedir=%p/var/%n/shared --localstatedir=%p/var/%n/local --libdir=%p/lib/%n --includedir=%p/include/%n --infodir=%p/share/info --mandir=%p/share/man/%n --enable-shared --enable-static --disable-dependency-tracking +Source: http://www.open-mpi.org/software/ompi/v1.2/downloads/openmpi-%v.tar.bz2 +Source-MD5: 7f553317e388c4efe479e908b66f910d +ConfigureParams: --prefix=%p --libexecdir=%p/lib/%n --datadir=%p/share/doc/%n --sysconfdir=%p/etc/%n --sharedstatedir=%p/var/%n/shared --localstatedir=%p/var/%n/local --libdir=%p/lib/%n --includedir=%p/include --infodir=%p/share/info --mandir=%p/share/man/%n --enable-shared --enable-static --disable-dependency-tracking Patch: %n.patch InstallScript: << #!/bin/sh -ev +cd ompi/include +mv mpi.h mpi.h.org +sed "s|ompi/mpi/cxx/mpicxx.h|openmpi/ompi/mpi/cxx/mpicxx.h|g" < mpi.h.org > mpi.h +cd ../mpi/cxx +mv mpicxx.h mpicxx.h.org +sed "s|ompi/mpi/cxx|openmpi/ompi/mpi/cxx|g" < mpicxx.h.org > mpicxx.h +cd ../../.. make install DESTDIR=%d mv %i/bin/mpic++ %i/bin/om-mpic++ mv %i/bin/mpicc %i/bin/om-mpicc @@ -28,6 +35,10 @@ ln -s %p/bin/om-mpicxx %i/bin/mpicxx ln -s %p/bin/om-mpif77 %i/bin/mpif77 ln -s %p/bin/om-mpif90 %i/bin/mpif90 +ln -s %p/lib/%N/libopen-pal.0.dylib %i/lib/%N/libopal.0.dylib +ln -s %p/lib/%N/libopen-pal.0.dylib %i/lib/%N/libopal.dylib +ln -s %p/lib/%N/libopen-rte.0.dylib %i/lib/%N/liborte.0.dylib +ln -s %p/lib/%N/libopen-rte.0.dylib %i/lib/%N/liborte.dylib << DocFiles: AUTHORS INSTALL LICENSE README VERSION SplitOff: << @@ -36,10 +47,11 @@ lib/%N/lib*.0.dylib << Shlibs: << - %p/lib/%N/libopal.0.0.0.dylib 1.0.0 %n (>= 1.1-1000) - %p/lib/%N/libmpi.0.0.0.dylib 1.0.0 %n (>= 1.1-1000) - %p/lib/%N/liborte.0.0.0.dylib 1.0.0 %n (>= 1.1-1000) - %p/lib/%N/libmpi_cxx.0.0.0.dylib 1.0.0 %n (>= 1.1-1000) + %p/lib/%N/libopen-pal.0.dylib 1.0.0 %n (>= 1.2.2-1000) + %p/lib/%N/libmpi.0.dylib 1.0.0 %n (>= 1.2.2-1000) + %p/lib/%N/libopen-rte.0.dylib 1.0.0 %n (>= 1.2.2-1000) + %p/lib/%N/libmpi_cxx.0.dylib 1.0.0 %n (>= 1.2.2-1000) + %p/lib/%N/libmpi_f77.0.dylib 1.0.0 %n (>= 1.2.2-1000) << DocFiles: AUTHORS INSTALL LICENSE README VERSION Description: Shared libraries for openmpi package @@ -51,11 +63,14 @@ Replaces: lammpi-dev BuildDependsOnly: true Files: << - include/%N + include + lib/%N/libopen-pal.dylib lib/%N/libopal.dylib lib/%N/libmpi.dylib + lib/%N/libopen-rte.dylib lib/%N/liborte.dylib lib/%N/libmpi_cxx.dylib + lib/%N/libmpi_f77.dylib lib/%N/lib*.a lib/%N/lib*.la bin/mpic++ ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits