Apply patch from Brice Goglin.

Details are here:

  http://www.open-mpi.org/community/lists/hwloc-users/2014/11/1118.php