Remove bundled hwloc-1.2.1. Use either native Linux affinity support or an external libhwloc.

(for details see https://sourceforge.net/mailarchive/forum.php?thread_name=CAJpkDYeZpwqcWxZ77wq6bMrnhn-KzkU1xAqb3cU0drfnA3n9FQ%40mail.gmail.com&forum_name=htop-general )

Makefile.am

 
-if HAVE_BUNDLED_HWLOC
-SUBDIRS = hwloc-1.2.1
-endif
-
-ACLOCAL_AMFLAGS = -I m4 -I hwloc-1.2.1/config
+ACLOCAL_AMFLAGS = -I m4
 
 bin_PROGRAMS = htop
 dist_man_MANS = htop.1
@@ -41,12 +37,6 @@ SUFFIXES = .h
 BUILT_SOURCES = $(myhtopheaders)
 htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h debug.h
 
-if HAVE_BUNDLED_HWLOC
-htop_LDADD = $(HWLOC_EMBEDDED_LDADD) $(HWLOC_EMBEDDED_LIBS)
-AM_CFLAGS += $(HWLOC_EMBEDDED_CFLAGS)
-AM_CPPFLAGS += $(HWLOC_EMBEDDED_CPPFLAGS)
-endif
-
 profile:
 	$(MAKE) all CFLAGS="-pg -O2"
 

Process.c

@@ -29,7 +29,7 @@ in the source distribution for its full text.
 #include <sched.h>
 #include <time.h>
 
-#ifdef HAVE_HWLOC
+#ifdef HAVE_LIBHWLOC
 #include <hwloc/linux.h>
 #endif
 
@@ -566,7 +566,7 @@ bool Process_setPriority(Process* this, int priority) {
    return (err == 0);
 }
 
-#ifdef HAVE_HWLOC
+#ifdef HAVE_LIBHWLOC
 
 Affinity* Process_getAffinity(Process* this) {
    hwloc_cpuset_t cpuset = hwloc_bitmap_alloc();

Process.h

@@ -32,7 +32,7 @@ in the source distribution for its full text.
 #include <sched.h>
 #include <time.h>
 
-#ifdef HAVE_HWLOC
+#ifdef HAVE_LIBHWLOC
 #include <hwloc/linux.h>
 #endif
 
@@ -196,7 +196,7 @@ void Process_toggleTag(Process* this);
 
 bool Process_setPriority(Process* this, int priority);
 
-#ifdef HAVE_HWLOC
+#ifdef HAVE_LIBHWLOC
 
 Affinity* Process_getAffinity(Process* this);
 

ProcessList.c

@@ -115,7 +115,7 @@ typedef struct ProcessList_ {
    int kernelThreads;
    int runningTasks;
 
-   #ifdef HAVE_HWLOC
+   #ifdef HAVE_LIBHWLOC
    hwloc_topology_t topology;
    bool topologyOk;
    #endif
@@ -195,7 +195,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable) {
    fclose(file);
    this->cpuCount = cpus - 1;
 
-#ifdef HAVE_HWLOC
+#ifdef HAVE_LIBHWLOC
    this->topologyOk = false;
    int topoErr = hwloc_topology_init(&this->topology);
    if (topoErr == 0) {

ProcessList.h

@@ -117,7 +117,7 @@ typedef struct ProcessList_ {
    int kernelThreads;
    int runningTasks;
 
-   #ifdef HAVE_HWLOC
+   #ifdef HAVE_LIBHWLOC
    hwloc_topology_t topology;
    bool topologyOk;
    #endif

acinclude.m4

-m4_include(hwloc-1.2.1/config/hwloc.m4)
-m4_include(hwloc-1.2.1/config/hwloc_pkg.m4)

configure.ac

@@ -131,32 +131,12 @@ if test "x$enable_native_affinity" = xyes; then
      [AC_MSG_RESULT([no])])
 fi
 
-##### hwloc
-AC_ARG_ENABLE(system-hwloc, [AC_HELP_STRING([--enable-system-hwloc], [use the copy of hwloc from your system and not the one bundled with the htop sources. (hwloc required)])], ,enable_system_hwloc="no")
-enable_xml=no
-AC_ARG_ENABLE(hwloc, [AC_HELP_STRING([--enable-hwloc], [enable hwloc support for CPU affinity])],, test "x$enable_native_affinity" = xno && enable_hwloc="yes")
+AC_ARG_ENABLE(hwloc, [AC_HELP_STRING([--enable-hwloc], [enable hwloc support for CPU affinity])],, enable_hwloc="no")
 if test "x$enable_hwloc" = xyes
 then
-   if test "x$enable_system_hwloc" = xyes
-   then
-      AC_CHECK_LIB([hwloc], [hwloc_linux_get_tid_cpubind], [], [missing_libraries="$missing_libraries libhwloc"])
-      AC_CHECK_HEADERS([hwloc.h],[:], [missing_headers="$missing_headers $ac_header"])
-
-   else
-      HWLOC_SETUP_CORE([hwloc-1.2.1], [hwloc_bundled=yes], [hwloc_bundled=no])
-   fi
+   AC_CHECK_LIB([hwloc], [hwloc_linux_get_tid_cpubind], [], [missing_libraries="$missing_libraries libhwloc"])
+   AC_CHECK_HEADERS([hwloc.h],[:], [missing_headers="$missing_headers $ac_header"])
 fi
-HWLOC_DO_AM_CONDITIONALS
-AM_CONDITIONAL([HAVE_HWLOC], [test "x$hwloc_bundled" = "xyes" -o "x$hwloc_system" = "xyes"])
-AM_CONDITIONAL([HAVE_BUNDLED_HWLOC], [test "x$hwloc_bundled" = "xyes"])
-if test "x$hwloc_system" = "xyes"; then
-   AC_DEFINE([HAVE_SYSTEM_HWLOC], 1, [Have system hwloc])
-   AC_DEFINE([HAVE_HWLOC], 1, [Have hwloc])
-elif test "x$hwloc_bundled" = "xyes"; then
-   AC_DEFINE([HAVE_BUNDLED_HWLOC], 1, [Use bundled hwloc])
-   AC_DEFINE([HAVE_HWLOC], 1, [Have hwloc])
-fi
-#####
 
 AC_CONFIG_FILES([Makefile htop.1])
 AC_OUTPUT

htop.c

@@ -123,7 +123,7 @@ static void showHelp(ProcessList* pl) {
    mvaddstr(15, 0, "   F9 k: kill process/tagged processes      P: sort by CPU%");
    mvaddstr(16, 0, "   ] F7: higher priority (root only)        M: sort by MEM%");
    mvaddstr(17, 0, "   [ F8: lower priority (+ nice)            T: sort by TIME");
-#ifdef HAVE_HWLOC
+#if (HAVE_LIBHWLOC || HAVE_NATIVE_AFFINITY)
    if (pl->cpuCount > 1)
       mvaddstr(18, 0, "      a: set CPU affinity                   I: invert sort order");
    else
@@ -144,7 +144,7 @@ static void showHelp(ProcessList* pl) {
    mvaddstr(16, 0, "   ] F7"); mvaddstr(16,40, "    M");
    mvaddstr(17, 0, "   [ F8"); mvaddstr(17,40, "    T");
                                mvaddstr(18,40, " F4 I");
-#if HAVE_HWLOC
+#if (HAVE_LIBHWLOC || HAVE_NATIVE_AFFINITY)
    if (pl->cpuCount > 1)
       mvaddstr(18, 0, "      a:");
 #endif
@@ -773,7 +773,7 @@ int main(int argc, char** argv) {
          refreshTimeout = 0;
          break;
       }
-#if (HAVE_HWLOC || HAVE_NATIVE_AFFINITY)
+#if (HAVE_LIBHWLOC || HAVE_NATIVE_AFFINITY)
       case 'a':
       {
          if (pl->cpuCount == 1)

hwloc-1.2.1/AUTHORS

-Cédric Augonnet <Cedric.Augonnet@labri.fr>
-Jérôme Clet-Ortega <Jerome.Clet-Ortega@labri.fr>
-Ludovic Courtès <Ludovic.Courtes@inria.fr>
-Brice Goglin <Brice.Goglin@inria.fr>
-Nathalie Furmento <Nathalie.Furmento@labri.fr>
-Samuel Thibault <Samuel.Thibault@labri.fr>
-Jeff Squyres <jsquyres@cisco.com>
-Alexey Kardashevskiy <aik@au1.ibm.com>

hwloc-1.2.1/COPYING

-Copyright © 2009 CNRS
-Copyright © 2009 INRIA.  All rights reserved.
-Copyright © 2009 Université Bordeaux 1
-Copyright © 2009 Cisco Systems, Inc.  All rights reserved.
-See COPYING in top-level directory.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

hwloc-1.2.1/Makefile.am

-# Copyright © 2009      INRIA.  All rights reserved.
-# Copyright © 2009      Université Bordeaux 1
-# Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
-# See COPYING in top-level directory.
-
-# Note that the -I directory must *exactly* match what was specified
-# via AC_CONFIG_MACRO_DIR in configure.ac.
-ACLOCAL_AMFLAGS = -I ./config
-
-SUBDIRS = src include
-
-# Do not let automake automatically add the non-standalone dirs to the
-# distribution tarball if we're building in embedded mode.
-DIST_SUBDIRS = $(SUBDIRS)
-
-#
-# "make distcheck" requires that tarballs are able to be able to "make
-# dist", so we have to include config/distscript.csh.
-#
-EXTRA_DIST = \
-        README VERSION COPYING AUTHORS \
-        config/hwloc_get_version.sh \
-        config/distscript.csh
-
-#
-# Build the top-level README file
-#

hwloc-1.2.1/Makefile.in

-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Copyright © 2009      INRIA.  All rights reserved.
-# Copyright © 2009      Université Bordeaux 1
-# Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
-# See COPYING in top-level directory.
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = hwloc-1.2.1
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	AUTHORS COPYING NEWS
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/hwloc-1.2.1/config/hwloc_check_attributes.m4 \
-	$(top_srcdir)/hwloc-1.2.1/config/hwloc_check_visibility.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/hwloc-1.2.1/config/hwloc.m4 \
-	$(top_srcdir)/hwloc-1.2.1/config/hwloc_pkg.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h \
-	$(top_builddir)/hwloc-1.2.1/include/private/autogen/config.h \
-	$(top_builddir)/hwloc-1.2.1/include/hwloc/autogen/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BASH = @BASH@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-HWLOC_CFLAGS = @HWLOC_CFLAGS@
-HWLOC_CPPFLAGS = @HWLOC_CPPFLAGS@
-HWLOC_EMBEDDED_CFLAGS = @HWLOC_EMBEDDED_CFLAGS@
-HWLOC_EMBEDDED_CPPFLAGS = @HWLOC_EMBEDDED_CPPFLAGS@
-HWLOC_EMBEDDED_LDADD = @HWLOC_EMBEDDED_LDADD@
-HWLOC_EMBEDDED_LIBS = @HWLOC_EMBEDDED_LIBS@
-HWLOC_HAVE_XML = @HWLOC_HAVE_XML@
-HWLOC_KERRIGHED_CFLAGS = @HWLOC_KERRIGHED_CFLAGS@
-HWLOC_KERRIGHED_LIBS = @HWLOC_KERRIGHED_LIBS@
-HWLOC_LDFLAGS = @HWLOC_LDFLAGS@
-HWLOC_LIBS = @HWLOC_LIBS@
-HWLOC_LINUX_LIBNUMA_LIBS = @HWLOC_LINUX_LIBNUMA_LIBS@
-HWLOC_MS_LIB = @HWLOC_MS_LIB@
-HWLOC_PKG_CONFIG = @HWLOC_PKG_CONFIG@
-HWLOC_REQUIRES = @HWLOC_REQUIRES@
-HWLOC_XML_CFLAGS = @HWLOC_XML_CFLAGS@
-HWLOC_XML_LIBS = @HWLOC_XML_LIBS@
-HWLOC_top_builddir = @HWLOC_top_builddir@
-HWLOC_top_srcdir = @HWLOC_top_srcdir@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# Note that the -I directory must *exactly* match what was specified
-# via AC_CONFIG_MACRO_DIR in configure.ac.
-ACLOCAL_AMFLAGS = -I ./config
-SUBDIRS = src include
-
-# Do not let automake automatically add the non-standalone dirs to the
-# distribution tarball if we're building in embedded mode.
-DIST_SUBDIRS = $(SUBDIRS)
-
-#
-# "make distcheck" requires that tarballs are able to be able to "make
-# dist", so we have to include config/distscript.csh.
-#
-EXTRA_DIST = \
-        README VERSION COPYING AUTHORS \
-        config/hwloc_get_version.sh \
-        config/distscript.csh
-
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu hwloc-1.2.1/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu hwloc-1.2.1/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-
-#
-# Build the top-level README file
-#
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

hwloc-1.2.1/NEWS

-Copyright © 2009 CNRS
-Copyright © 2009-2011 INRIA.  All rights reserved.
-Copyright © 2009-2011 Université Bordeaux 1
-Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
-
-$COPYRIGHT$
-
-Additional copyrights may follow
-
-$HEADER$
-
-===========================================================================
-
-This file contains the main features as well as overviews of specific
-bug fixes (and other actions) for each version of hwloc since version
-0.9 (as initially released as "libtopology", then re-branded to "hwloc"
-in v0.9.1).
-
-
-Version 1.2.1
--------------
-* Improve support of AMD Bulldozer "Compute-Unit" modules by detecting
-  logical processors with different core IDs on Linux.
-* Fix hwloc-ps crash when listing processes from another Linux cpuset.
-  Thanks to Carl Smith for reporting the problem.
-* Fix build on AIX and Solaris. Thanks to Carl Smith and Andreas Kupries
-  for reporting the problems.
-* Fix cache size detection on Darwin. Thanks to Erkcan Özcan for reporting
-  the problem.
-* Make configure fail if --enable-xml or --enable-cairo is given and
-  proper support cannot be found. Thanks to Andreas Kupries for reporting
-  the XML problem.
-* Fix spurious L1 cache detection on AIX. Thanks to Hendryk Bockelmann
-  for reporting the problem.
-* Fix hwloc_get_last_cpu_location(THREAD) on Linux. Thanks to Gabriele
-  Fatigati for reporting the problem.
-* Fix object distance detection on Solaris.
-* Add pthread_self weak symbol to ease static linking.
-* Minor documentation fixes.
-
-
-Version 1.2.0
--------------
-* Major features
-  + Expose latency matrices in the API as an array of distance structures
-    within objects. Add several helpers to find distances.
-  + Add hwloc_topology_set_distance_matrix() and environment variables
-    to provide a matrix of distances between a given set of objects.
-  + Add hwloc_get_last_cpu_location() and hwloc_get_proc_last_cpu_location()
-    to retrieve the processors where a process or thread recently ran.
-    - Add the corresponding --get-last-cpu-location option to hwloc-bind.
-  + Add hwloc_topology_restrict() to restrict an existing topology to a
-    given cpuset.
-    - Add the corresponding --restrict option to lstopo.
-* Minor API updates
-  + Add hwloc_bitmap_list_sscanf/snprintf/asprintf to convert between bitmaps
-    and strings such as 4-5,7-9,12,15-
-  + hwloc_bitmap_set/clr_range() now support infinite ranges.
-  + Clarify the difference between inserting Misc objects by cpuset or by
-    parent.
-  + hwloc_insert_misc_object_by_cpuset() now returns NULL in case of error.
-* Discovery improvements
-  + x86 backend (for freebsd): add x2APIC support
-  + Support standard device-tree phandle, to get better support on e.g. ARM
-    systems providing it.
-  + Detect cache size on AIX. Thanks Christopher and IBM.
-  + Improve grouping to support asymmetric topologies.
-* Tools
-  + Command-line tools now support "all" and "root" special locations
-    consisting in the entire topology, as well as type names with depth
-    attributes such as L2 or Group4.
-  + hwloc-calc improvements:
-    - Add --number-of/-N option to report the number of objects of a given
-      type or depth.
-    - -I is now equivalent to --intersect for listing the indexes of
-      objects of a given type or depth that intersects the input.
-    - Add -H to report the output as a hierarchical combination of types
-      and depths.
-  + Add --thissystem to lstopo.
-  + Add lstopo-win, a console-less lstopo variant on Windows.
-* Miscellaneous
-  + Remove C99 usage from code base.
-  + Rename hwloc-gather-topology.sh into hwloc-gather-topology
-  + Fix AMD cache discovery on freebsd when there is no L3 cache, thanks
-    Andriy Gapon for the fix.
-
-
-Version 1.1.2
--------------
-* Fix a segfault in the distance-based grouping code when some objects
-  are not placed in any group. Thanks to Bernd Kallies for reporting
-  the problem and providing a patch.
-* Fix the command-line parsing of hwloc-bind --mempolicy interleave.
-  Thanks to Guy Streeter for reporting the problem.
-* Stop truncating the output in hwloc_obj_attr_snprintf() and in the
-  corresponding lstopo output. Thanks to Guy Streeter for reporting the
-  problem.
-* Fix object levels ordering in synthetic topologies.
-* Fix potential incoherency between device tree and kernel information,
-  when SMT is disabled on Power machines.
-* Fix and document the behavior of hwloc_topology_set_synthetic() in case
-  of invalid argument. Thanks to Guy Streeter for reporting the problem.
-* Add some verbose error message reporting when it looks like the OS
-  gives erroneous information.
-* Do not include unistd.h and stdint.h in public headers on Windows.
-* Move config.h files into their own subdirectories to avoid name
-  conflicts when AC_CONFIG_HEADERS adds -I's for them.
-* Remove the use of declaring variables inside "for" loops.
-* Some other minor fixes.
-* Many minor documentation fixes.
-
-
-Version 1.1.1
--------------
-* Add hwloc_get_api_version() which returns the version of hwloc used
-  at runtime. Thanks to Guy Streeter for the suggestion.
-* Fix the number of hugepages reported for NUMA nodes on Linux.
-* Fix hwloc_bitmap_to_ulong() right after allocating the bitmap.
-  Thanks to Bernd Kallies for reporting the problem.
-* Fix hwloc_bitmap_from_ith_ulong() to properly zero the first ulong.
-  Thanks to Guy Streeter for reporting the problem.
-* Fix hwloc_get_membind_nodeset() on Linux.
-  Thanks to Bernd Kallies for reporting the problem and providing a patch.
-* Fix some file descriptor leaks in the Linux discovery.
-* Fix the minimum width of NUMA nodes, caches and the legend in the graphical
-  lstopo output. Thanks to Jirka Hladky for reporting the problem.
-* Various fixes to bitmap conversion from/to taskset-strings.
-* Fix and document snprintf functions behavior when the buffer size is too
-  small or zero. Thanks to Guy Streeter for reporting the problem.
-* Fix configure to avoid spurious enabling of the cpuid backend.
-  Thanks to Tim Anderson for reporting the problem.
-* Cleanup error management in hwloc-gather-topology.sh.
-  Thanks to Jirka Hladky for reporting the problem and providing a patch.
-* Add a manpage and usage for hwloc-gather-topology.sh on Linux.
-  Thanks to Jirka Hladky for providing a patch.
-* Memory binding documentation enhancements.
-
-
-Version 1.1.0
--------------
-
-* API
-  + Increase HWLOC_API_VERSION to 0x00010100 so that API changes may be
-    detected at build-time.
-  + Add a memory binding interface.
-  + The cpuset API (hwloc/cpuset.h) is now deprecated. It is replaced by
-    the bitmap API (hwloc/bitmap.h) which offers the same features with more
-    generic names since it applies to CPU sets, node sets and more.
-    Backward compatibility with the cpuset API and ABI is still provided but
-    it will be removed in a future release.
-    Old types (hwloc_cpuset_t, ...) are still available as a way to clarify
-    what kind of hwloc_bitmap_t each API function manipulates.
-    Upgrading to the new API only requires to replace hwloc_cpuset_ function
-    calls with the corresponding hwloc_bitmap_ calls, with the following
-    renaming exceptions:
-    - hwloc_cpuset_cpu -> hwloc_bitmap_only
-    - hwloc_cpuset_all_but_cpu -> hwloc_bitmap_allbut
-    - hwloc_cpuset_from_string -> hwloc_bitmap_sscanf
-  + Add an `infos' array in each object to store couples of info names and
-    values. It enables generic storage of things like the old dmi board infos
-    that were previously stored in machine specific attributes.
-  + Add linesize cache attribute.
-* Features
-  + Bitmaps (and thus CPU sets and node sets) are dynamically (re-)allocated,
-    the maximal number of CPUs (HWLOC_NBMAXCPUS) has been removed.
-  + Improve the distance-based grouping code to better support irregular
-    distance matrices.
-  + Add support for device-tree to get cache information (useful on Power
-    architectures).
-* Helpers
-  + Add NVIDIA CUDA helpers in cuda.h and cudart.h to ease interoperability
-    with CUDA Runtime and Driver APIs.
-  + Add Myrinet Express helper in myriexpress.h to ease interoperability.
-* Tools
-  + lstopo now displays physical/OS indexes by default in graphical mode
-    (use -l to switch back to logical indexes). The textual output still uses
-    logical by default (use -p to switch to physical indexes).
-  + lstopo prefixes logical indexes with `L#' and physical indexes with `P#'.
-    Physical indexes are also printed as `P#N' instead of `phys=N' within
-    object attributes (in parentheses).
-  + Add a legend at the bottom of the lstopo graphical output, use --no-legend
-    to remove it.
-  + Add hwloc-ps to list process' bindings.
-  + Add --membind and --mempolicy options to hwloc-bind.
-  + Improve tools command-line options by adding a generic --input option
-    (and more) which replaces the old --xml, --synthetic and --fsys-root.
-  + Cleanup lstopo output configuration by adding --output-format.
-  + Add --intersect in hwloc-calc, and replace --objects with --largest.
-  + Add the ability to work on standard input in hwloc-calc.
-  + Add --from, --to and --at in hwloc-distrib.
-  + Add taskset-specific functions and command-line tools options to
-    manipulate CPU set strings in the format of the taskset program.
-  + Install hwloc-gather-topology.sh on Linux.
-
-
-Version 1.0.3
--------------
-
-* Fix support for Linux cpuset when emulated by a cgroup mount point.
-* Remove unneeded runtime dependency on libibverbs.so in the library and
-  all utils programs.
-* Fix hwloc_cpuset_to_linux_libnuma_ulongs in case of non-linear OS-indexes
-  for NUMA nodes.
-* lstopo now displays physical/OS indexes by default in graphical mode
-  (use -l to switch back to logical indexes). The textual output still uses
-  logical by default (use -p to switch to physical indexes).
-
-
-Version 1.0.2
--------------
-
-* Public headers can now be included directly from C++ programs.
-* Solaris fix for non-contiguous cpu numbers.  Thanks to Rolf vandeVaart for
-  reporting the issue.
-* Darwin 10.4 fix.  Thanks to Olivier Cessenat for reporting the issue.
-* Revert 1.0.1 patch that ignored sockets with unknown ID values since it
-  only slightly helped POWER7 machines with old Linux kernels while it
-  prevents recent kernels from getting the complete POWER7 topology.
-* Fix hwloc_get_common_ancestor_obj().
-* Remove arch-specific bits in public headers.
-* Some fixes in the lstopo graphical output.
-* Various man page clarifications and minor updates.
-
-
-Version 1.0.1
--------------
-
-* Various Solaris fixes.  Thanks to Yannick Martin for reporting the issue.
-* Fix "non-native" builds on x86 platforms (e.g., when building 32
-  bit executables with compilers that natively build 64 bit).
-* Ignore sockets with unknown ID values (which fixes issues on POWER7
-  machines).  Thanks to Greg Bauer for reporting the issue.
-* Various man page clarifications and minor updates.
-* Fixed memory leaks in hwloc_setup_group_from_min_distance_clique().
-* Fix cache type filtering on MS Windows 7.  Thanks to Αλέξανδρος
-  Παπαδογιαννάκ for reporting the issue.
-* Fixed warnings when compiling with -DNDEBUG.
-
-
-Version 1.0.0
--------------
-
-* The ABI of the library has changed.
-* Backend updates
-  + Add FreeBSD support.
-  + Add x86 cpuid based backend.
-  + Add Linux cgroup support to the Linux cpuset code.
-  + Support binding of entire multithreaded process on Linux.
-  + Fix and enable Group support in Windows.
-  + Cleanup XML export/import.
-* Objects
-  + HWLOC_OBJ_PROC is renamed into HWLOC_OBJ_PU for "Processing Unit",
-    its stringified type name is now "PU".
-  + Use new HWLOC_OBJ_GROUP objects instead of MISC when grouping
-    objects according to NUMA distances or arbitrary OS aggregation.
-  + Rework memory attributes.
-  + Add different cpusets in each object to specify processors that
-    are offline, unavailable, ...
-  + Cleanup the storage of object names and DMI infos.
-* Features
-  + Add support for looking up specific PID topology information.
-  + Add hwloc_topology_export_xml() to export the topology in a XML file.
-  + Add hwloc_topology_get_support() to retrieve the supported features
-    for the current topology context.
-  + Support non-SYSTEM object as the root of the tree, use MACHINE in
-    most common cases.
-  + Add hwloc_get_*cpubind() routines to retrieve the current binding
-    of processes and threads.
-* API
-  + Add HWLOC_API_VERSION to help detect the currently used API version.
-  + Add missing ending "e" to *compare* functions.
-  + Add several routines to emulate PLPA functions.
-  + Rename and rework the cpuset and/or/xor/not/clear operators to output
-    their result in a dedicated argument instead of modifying one input.
-  + Deprecate hwloc_obj_snprintf() in favor of hwloc_obj_type/attr_snprintf().
-  + Clarify the use of parent and ancestor in the API, do not use father.
-  + Replace hwloc_get_system_obj() with hwloc_get_root_obj().
-  + Return -1 instead of HWLOC_OBJ_TYPE_MAX in the API since the latter
-    isn't public.
-  + Relax constraints in hwloc_obj_type_of_string().
-  + Improve displaying of memory sizes.
-  + Add 0x prefix to cpuset strings.
-* Tools
-  + lstopo now displays logical indexes by default, use --physical to
-    revert back to OS/physical indexes.
-  + Add colors in the lstopo graphical outputs to distinguish between online,
-    offline, reserved, ... objects.
-  + Extend lstopo to show cpusets, filter objects by type, ...
-  + Renamed hwloc-mask into hwloc-calc which supports many new options.
-* Documentation
-  + Add a hwloc(7) manpage containing general information.
-  + Add documentation about how to switch from PLPA to hwloc.
-  + Cleanup the distributed documentation files.
-* Miscellaneous
-  + Many compilers warning fixes.
-  + Cleanup the ABI by using the visibility attribute.
-  + Add project embedding support.
-
-
-Version 0.9.4 (unreleased)
---------------------------
-
-* Fix reseting colors to normal in lstopo -.txt output.
-* Fix Linux pthread_t binding error report.
-
-
-Version 0.9.3
--------------
-
-* Fix autogen.sh to work with Autoconf 2.63.
-* Fix various crashes in particular conditions:
-  - xml files with root attributes
-  - offline CPUs
-  - partial sysfs support
-  - unparseable /proc/cpuinfo
-  - ignoring NUMA level while Misc level have been generated
-* Tweak documentation a bit
-* Do not require the pthread library for binding the current thread on Linux
-* Do not erroneously consider the sched_setaffinity prototype is the old version
-  when there is actually none.
-* Fix _syscall3 compilation on archs for which we do not have the
-  sched_setaffinity system call number.
-* Fix AIX binding.
-* Fix libraries dependencies: now only lstopo depends on libtermcap, fix
-  binutils-gold link
-* Have make check always build and run hwloc-hello.c
-* Do not limit size of a cpuset.
-
-
-Version 0.9.2
--------------
-
-* Trivial documentation changes.
-
-
-Version 0.9.1
--------------
-
-* Re-branded to "hwloc" and moved to the Open MPI project, relicensed under the
-  BSD license.
-* The prefix of all functions and tools is now hwloc, and some public
-  functions were also renamed for real.
-* Group NUMA nodes into Misc objects according to their physical distance
-  that may be reported by the OS/BIOS.
-  May be ignored by setting HWLOC_IGNORE_DISTANCES=1 in the environment.
-* Ignore offline CPUs on Solaris.
-* Improved binding support on AIX.
-* Add HP-UX support.
-* CPU sets are now allocated/freed dynamically.
-* Add command line options to tune the lstopo graphical output, add
-  semi-graphical textual output
-* Extend topobind to support multiple cpusets or objects on the command
-  line as topomask does.
-* Add an Infiniband-specific helper hwloc/openfabrics-verbs.h to retrieve
-  the physical location of IB devices.
-
-
-Version 0.9 (libtopology)
--------------------------
-
-* First release.

hwloc-1.2.1/VERSION

-# This is the VERSION file for hwloc, describing the precise version
-# of hwloc in this distribution.  The various components of the version
-# number below are combined to form a single version number string.
-
-# major, minor, and release are generally combined in the form
-# <major>.<minor>.<release>.  If release is zero, then it is omitted.
-
-major=1
-minor=2
-release=1
-
-# greek is used for alpha or beta release tags.  If it is non-empty,
-# it will be appended to the version number.  It does not have to be
-# numeric.  Common examples include a1 (alpha release 1), b1 (beta
-# release 1), sc2005 (Super Computing 2005 release).  The only
-# requirement is that it must be entirely printable ASCII characters
-# and have no white space.
-
-greek=
-
-# If want_repo_rev=1, then the SVN r number will be included in the overall
-# hwloc version number in some form.
-
-want_repo_rev=0
-
-# If repo_rev=-1, then the repository version number will be obtained
-# dynamically at run time, either: 
-#
-# 1) via the "svnversion" command (if this is a Subversion checkout)
-#    in the form "r<svn_r>", or 
-# 2) via the "hg -v -R tip" command (if this is a Mercurial clone)
-#    in the form of "hg<hash>", using the hash tag at the tip
-# 3) via the "git log -1" command (if this is a Git clone) in the form
-#    of "git<hash>", using the hash tag at the HEAD
-# 4) with the date (if none of the above work) in the form of
-#    "date<date>".
-#
-# Alternatively, if repo_rev is not -1, the value of repo_rev_r will
-# be directly appended to the version string.  This happens during
-# "make dist", for example: if the distribution tarball is being made
-# from an SVN checkout, if repo_rev=-1, then its value is replaced
-# with the output of "svnversion".
-
-repo_rev=r3619
-
-# The date when this release was created
-
-date="Aug 16, 2011"
-
-# The shared library version of hwloc's public library.  This version
-# is maintained in accordance with the "Library Interface Versions"
-# chapter from the GNU Libtool documentation.  Notes:
-
-# 1. Since version numbers are associated with *releases*, the version
-# number maintained on the hwloc SVN trunk (and developer branches) is
-# always 0:0:0.
-
-# 2. Version numbers are described in the Libtool current:revision:age
-# format.
-
-libhwloc_so_version=3:1:3

hwloc-1.2.1/config/compile

-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2009-10-06.20; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-# Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End: