Fix external hwloc builds

Remove spurious comma in header file definition. Remove unused variables

Signed-off-by: Ralph Castain <rhc@open-mpi.org>

contrib/platform/intel/bend/linux

@@ -23,8 +23,8 @@ with_memory_manager=no
 with_tm=no
 with_psm=no
 with_psm2=no
-with_libfabric=/home/common/libfabric/build
 with_devel_headers=yes
+with_libfabric=no
 with_portals=no
 with_valgrind=no
 if [ -n "$SLURMHOME" ] ; then

opal/mca/hwloc/base/hwloc_base_util.c

@@ -13,7 +13,7 @@
  * Copyright (c) 2011-2018 Cisco Systems, Inc.  All rights reserved
  * Copyright (c) 2012-2017 Los Alamos National Security, LLC.
  *                         All rights reserved.
- * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
  * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
@@ -708,9 +708,7 @@ static hwloc_obj_t df_search(hwloc_topology_t topo,
                              opal_hwloc_resource_type_t rtype,
                              unsigned int *num_objs)
 {
-    unsigned k;
     hwloc_obj_t obj;
-    opal_hwloc_obj_data_t *data;
     int search_depth;
 
     search_depth = hwloc_get_type_depth(topo, target);
@@ -757,7 +755,7 @@ static hwloc_obj_t df_search(hwloc_topology_t topo,
         return found;
     }
     if (OPAL_HWLOC_AVAILABLE == rtype) {
-        int idx = 0;
+        unsigned idx = 0;
         if (num_objs)
             *num_objs = hwloc_get_nbobjs_inside_cpuset_by_depth(topo, start->cpuset, search_depth);
         obj = NULL;

opal/mca/hwloc/external/configure.m4

@@ -4,6 +4,7 @@
 # Copyright (c) 2014-2017 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 #
+# Copyright (c) 2018      Intel, Inc. All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -63,7 +64,7 @@ AC_DEFUN([MCA_opal_hwloc_external_POST_CONFIG],[
            # the MCA_hwloc_external_openfabrics_helper define).
            AS_IF([test "$opal_hwloc_dir" != ""],
                  [opal_hwloc_include="$opal_hwloc_dir/include/hwloc.h"
-                  opal_hwloc_shmem_include="$opal_hwloc_dir/include/hwloc/shmem.h",
+                  opal_hwloc_shmem_include="$opal_hwloc_dir/include/hwloc/shmem.h"
                   opal_hwloc_openfabrics_include="$opal_hwloc_dir/include/hwloc/openfabrics-verbs.h"],
                  [opal_hwloc_include="hwloc.h"
                   opal_hwloc_shmem_include="hwloc/shmem.h"