[Pkg-openmpi-commits] r311 - in /openmpi/trunk/debian/patches: fix_orte_default_hostfile_path.diff series

[volat-guest at users.alioth.debian.org]

Author: volat-guest
Date: Tue Jun 26 07:45:47 2012
New Revision: 311

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=311
Log:
Import the fix for orte sysconfdir path.

Added:
    openmpi/trunk/debian/patches/fix_orte_default_hostfile_path.diff
Modified:
    openmpi/trunk/debian/patches/series

Added: openmpi/trunk/debian/patches/fix_orte_default_hostfile_path.diff
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/fix_orte_default_hostfile_path.diff?rev=311&op=file
==============================================================================
--- openmpi/trunk/debian/patches/fix_orte_default_hostfile_path.diff (added)
+++ openmpi/trunk/debian/patches/fix_orte_default_hostfile_path.diff Tue Jun 26 07:45:47 2012
@@ -1,0 +1,11 @@
+--- a/orte/runtime/orte_mca_params.c
++++ b/orte/runtime/orte_mca_params.c
+@@ -225,7 +225,7 @@
+                                 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);

Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=311&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Tue Jun 26 07:45:47 2012
@@ -9,3 +9,4 @@
 # 658600: Regression of bug 531522
 #fix-fakeroot-execution.patch
 arm_detection.diff
+fix_orte_default_hostfile_path.diff