[Pkg-openmpi-maintainers] Bug#846965: openmpi: ftbfs on hurd-i386: more *MAX* occurrences

[Samuel Thibault]

Source: openmpi
Version: 2.0.2~git.20161225-2
Severity: important
Tags: upstream patch
User: debian-hurd at lists.debian.org
Usertags: hurd

Hello,

The latest upload of openmpi to experimental FTBFS, due to
MAXHOSTNAMELEN and PATH_MAX.  The attached patch fixes the build_hurd
patch to fix this.

Samuel

-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.8.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
--- debian/patches/build_hurd.original	2016-12-04 17:24:01.000000000 +0000
+++ debian/patches/build_hurd	2016-12-04 17:27:50.000000000 +0000
@@ -226,3 +211,35 @@
  ssize_t  mca_fbtl_posix_pwritev(mca_io_ompio_file_t *fh )
  {
      /*int *fp = NULL;*/
+Index: openmpi-2.0.2~git.20161225/opal/mca/pmix/pmix3x/pmix/src/mca/base/pmix_mca_base_component_find.c
+===================================================================
+--- openmpi-2.0.2~git.20161225.orig/opal/mca/pmix/pmix3x/pmix/src/mca/base/pmix_mca_base_component_find.c
++++ openmpi-2.0.2~git.20161225/opal/mca/pmix/pmix3x/pmix/src/mca/base/pmix_mca_base_component_find.c
+@@ -339,7 +339,7 @@ static int component_find_check (pmix_mc
+         }
+ 
+         if (!found) {
+-            char h[MAXHOSTNAMELEN];
++            char h[PMIX_MAXHOSTNAMELEN];
+             gethostname(h, sizeof(h));
+             pmix_show_help("help-mca-base.txt",
+                            "find-available:not-valid", true,
+Index: openmpi-2.0.2~git.20161225/opal/mca/pmix/pmix3x/pmix/src/mca/base/pmix_mca_base_var.c
+===================================================================
+--- openmpi-2.0.2~git.20161225.orig/opal/mca/pmix/pmix3x/pmix/src/mca/base/pmix_mca_base_var.c
++++ openmpi-2.0.2~git.20161225/opal/mca/pmix/pmix3x/pmix/src/mca/base/pmix_mca_base_var.c
+@@ -420,8 +420,13 @@ int pmix_mca_base_var_cache_files(bool r
+     home = (char*)pmix_home_directory();
+ 
+     if(NULL == cwd) {
++#if !defined(MAXPATHLEN) && defined (__GLIBC__)
++        if( NULL == (cwd = get_current_dir_name() ))
++#else
+         cwd = (char *) malloc(sizeof(char) * MAXPATHLEN);
+-        if( NULL == (cwd = getcwd(cwd, MAXPATHLEN) )) {
++        if( NULL == (cwd = getcwd(cwd, MAXPATHLEN) ))
++#endif
++        {
+             pmix_output(0, "Error: Unable to get the current working directory\n");
+             cwd = strdup(".");
+         }