rpms/openmpi
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebase hostfile patch for 1.6

Browse Source
This commit is contained in:
Orion Poplawski 2012-05-15 16:36:19 -06:00
parent 8148523807
commit b657ab44d6
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
openmpi-hostfile.patch
View File

@ -1,13 +1,12 @@
Index: orte/runtime/orte_mca_params.c
===================================================================
--- orte/runtime/orte_mca_params.c (revision 26440)
+++ orte/runtime/orte_mca_params.c (working copy)
@@ -303,7 +303,7 @@
false, false, NULL, &strval);
if (NULL == strval) {
/* nothing was given, so define the default */
- asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix);
+ asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir);
/* flag that nothing was given */
orte_default_hostfile_given = false;
} else if (0 == strcmp(strval, "none")) {
diff -up openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile openmpi-1.6/orte/runtime/orte_mca_params.c
--- openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile 2012-04-24 13:18:21.000000000 -0600
+++ openmpi-1.6/orte/runtime/orte_mca_params.c 2012-05-15 16:35:24.769565442 -0600
@@ -225,7 +225,7 @@ int orte_register_params(void)
false, false, 1000, &orte_timeout_usec_per_proc);
/* default hostfile */
- asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix);
+ asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir);
mca_base_param_reg_string_name("orte", "default_hostfile",
"Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)",
false, false, orte_default_hostfile, &orte_default_hostfile);

2
openmpi.spec
View File

@ -117,7 +117,7 @@ Contains development headers and libraries for openmpi
%prep
%setup -q -n openmpi-%{version}
%patch0 -p1 -b .removed
%patch1 -p0 -b .hostfile
%patch1 -p1 -b .hostfile
# Make sure we don't use the local libltdl library
rm -r opal/libltdl