utils/archivemount: disable on !linux

At least, the code doesn't build on Windows. And the tool will likely only
be used on Linux for loading Linux sysfs or cpuid tarballs.

Fixes commit 9e90d68

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

utils/hwloc/misc.h

@@ -277,6 +277,7 @@ hwloc_utils_enable_input_format(struct hwloc_topology *topology, unsigned long f
   }
 
   case HWLOC_UTILS_INPUT_ARCHIVE: {
+#ifdef HWLOC_LINUX_SYS
     char mntpath[] = "/tmp/tmpdir.hwloc.archivemount.XXXXXX";
     char mntcmd[512];
     char umntcmd[512];
@@ -324,6 +325,10 @@ hwloc_utils_enable_input_format(struct hwloc_topology *topology, unsigned long f
     err = hwloc_utils_enable_input_format(topology, flags, subdir, &sub_input_format, verbose, callname);
     if (!err)
       *input_format = sub_input_format;
+#else
+    fprintf(stderr, "This installation of hwloc does not support loading from an archive, sorry.\n");
+    exit(EXIT_FAILURE);
+#endif
     break;
   }
 

utils/lstopo/test-lstopo.sh.in

@@ -129,13 +129,11 @@ echo "**** Import from synthetic so that we can check some exact outputs in $fil
 ) > "$file"
 @DIFF@ @HWLOC_DIFF_U@ @HWLOC_DIFF_W@ $srcdir/test-lstopo.output "$file"
 
-if which archivemount >/dev/null 2>/dev/null; then
-  if test x@HWLOC_HAVE_LINUX@ = x1; then
-    echo "**** Archivemount'ing a Linux fsroot archive ..."
-    file="$tmp/test-lstopo.archivemount.fsroot.output"
-    $ls -i $HWLOC_top_srcdir/tests/hwloc/linux/16amd64-8n2c.tar.bz2 -v - | egrep -v "^assuming " > "$file"
-    @DIFF@ @HWLOC_DIFF_U@ @HWLOC_DIFF_W@ $HWLOC_top_srcdir/tests/hwloc/linux/16amd64-8n2c.console "$file"
-  fi
+if which archivemount >/dev/null 2>/dev/null && test x@HWLOC_HAVE_LINUX@ = x1; then
+  echo "**** Archivemount'ing a Linux fsroot archive ..."
+  file="$tmp/test-lstopo.archivemount.fsroot.output"
+  $ls -i $HWLOC_top_srcdir/tests/hwloc/linux/16amd64-8n2c.tar.bz2 -v - | egrep -v "^assuming " > "$file"
+  @DIFF@ @HWLOC_DIFF_U@ @HWLOC_DIFF_W@ $HWLOC_top_srcdir/tests/hwloc/linux/16amd64-8n2c.console "$file"
   if test x@HWLOC_HAVE_X86_CPUID@ = x1; then
     echo "**** Archivemount'ing a x86 CPUID archive ..."
     file="$tmp/test-lstopo.archivemount.cpuid.output"