From: Ole Streicher <olebole@debian.org>
Date: Wed, 30 Nov 2016 14:25:19 +0100
Subject: Fix compilation for GNU Hurd

However, the tests still fail.
---
 casa/OS/HostInfo.cc                          |  7 ++++
 casa/OS/{HostInfoDarwin.h => HostInfoHurd.h} | 62 ++++++----------------------
 casa/OS/Path.cc                              |  6 ++-
 casa/OS/malloc.cc                            |  2 +-
 casa/aipsenv.h                               |  7 ++++
 mirlib/bug.c                                 |  2 +-
 6 files changed, 32 insertions(+), 54 deletions(-)
 copy casa/OS/{HostInfoDarwin.h => HostInfoHurd.h} (65%)

diff --git a/casa/OS/HostInfo.cc b/casa/OS/HostInfo.cc
index 56662be..b2f253c 100644
--- a/casa/OS/HostInfo.cc
+++ b/casa/OS/HostInfo.cc
@@ -234,6 +234,13 @@ namespace casacore { //# NAMESPACE CASACORE - BEGIN
 HOSTINFO_IMPLEMENT_MEMBERS
 } //# NAMESPACE CASACORE - END
 
+#elif defined(AIPS_HURD)
+#include <casacore/casa/OS/HostInfoHurd.h>
+namespace casacore { //# NAMESPACE CASACORE - BEGIN
+
+HOSTINFO_IMPLEMENT_MEMBERS
+} //# NAMESPACE CASACORE - END
+
 #else
 namespace casacore { //# NAMESPACE CASACORE - BEGIN
 
diff --git a/casa/OS/HostInfoDarwin.h b/casa/OS/HostInfoHurd.h
similarity index 65%
copy from casa/OS/HostInfoDarwin.h
copy to casa/OS/HostInfoHurd.h
index d116617..41be38f 100644
--- a/casa/OS/HostInfoDarwin.h
+++ b/casa/OS/HostInfoHurd.h
@@ -4,9 +4,7 @@
 **  mechanics of finding various system details. The copyright details
 **  follow.
 **
-**  This is a modified version of the osf1 version. Initially, I tried
-**  to use the m_macosx.c version by Andrew S. Townley, but ran into
-**  problems...
+**  This is a modified version of the osf1 version.
 **
 **  --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 **
@@ -37,8 +35,8 @@
 **
 */
 
-#ifndef CASA_HOSTINFODARWIN_H
-#define CASA_HOSTINFODARWIN_H
+#ifndef CASA_HOSTINFOHURD_H
+#define CASA_HOSTINFOHURD_H
 
 # if defined(HOSTINFO_DO_IMPLEMENT)
 
@@ -47,12 +45,14 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+extern "C" {
 #include <mach/mach.h>
+}
 
 namespace casacore { //# NAMESPACE CASACORE - BEGIN
 
 // <summary>
-// HostInfo for Darwin machines.
+// HostInfo for GNU HURD machines.
 // </summary>
 
 // <use visibility=local>
@@ -65,7 +65,7 @@ namespace casacore { //# NAMESPACE CASACORE - BEGIN
 // </prerequisite>
 
 // <synopsis> 
-// This file provides the Linux specific functions for HostInfo.
+// This file provides the GNU HURD specific functions for HostInfo.
 // It is selectively included by HostInfo.cc.
 // </synopsis>
 //
@@ -107,10 +107,10 @@ HostMachineInfo::HostMachineInfo( ) : valid(1) {
 
     kern_return_t ret;
     struct host_basic_info basic_info;
-    unsigned int count = HOST_BASIC_INFO_COUNT;
+    mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT;
 
-    /* get the page size with portable sysconf and calculate pageshift from it */
-    pagesize_ = pagesize = sysconf(_SC_PAGESIZE);
+    /* get the page size with "getpagesize" and calculate pageshift from it */
+    pagesize_ = pagesize = getpagesize();
     pageshift = 0;
     while (pagesize > 1)
     {
@@ -121,65 +121,27 @@ HostMachineInfo::HostMachineInfo( ) : valid(1) {
     /* we only need the amount of log(2)1024 for our conversion */
     pageshift -= LOG1024;
 
-#ifdef AIPS_64B
-       ret = host_info( mach_host_self(), HOST_BASIC_INFO, (host_info64_t) &basic_info, &count );
-#else
        ret = host_info( mach_host_self(), HOST_BASIC_INFO, (host_info_t) &basic_info, &count );
-#endif
     if ( ret != KERN_SUCCESS ) {
 	valid = 0;
     } else {
-#ifdef AIPS_64B
-	memory_total = basic_info.max_mem / 1024;
-#else
 	memory_total = basic_info.memory_size / 1024;
-#endif
 	cpus = basic_info.avail_cpus;
     }
 }
 
 void HostMachineInfo::update_info( ) {
 
-#ifdef AIPS_64B
-    struct vm_statistics64 vmstats;
-#else
-    struct vm_statistics vmstats;
-#endif
+    vm_statistics_data_t vmstats;
     kern_return_t kr;
-    unsigned int count;
 
     /* memory information */
-    /* this is possibly bogus - we work out total # pages by */
-    /* adding up the free, active, inactive, wired down, and */
-    /* zero filled. Anyone who knows a better way, TELL ME!  */
-    /* Change: dont use zero filled. */
-    count = sizeof(vmstats)/sizeof(integer_t);
-
-#ifdef AIPS_64B
-       kr = host_statistics64( mach_host_self(), HOST_VM_INFO64, (host_info64_t) &vmstats, &count );
-#else
-       kr = host_statistics( mach_host_self(), HOST_VM_INFO, (host_info_t) &vmstats, &count );
-#endif
+    kr = vm_statistics( mach_task_self(), &vmstats);
     if ( kr != KERN_SUCCESS ) {
       valid = 0;
       return;
     }
 
-//     /* thanks DEC for the table() command. No thanks at all for   */
-//     /* omitting the man page for it from OSF/1 1.2, and failing   */
-//     /* to document SWAPINFO in the 1.3 man page. Lets hear it for */
-//     /* include files. */
-//     i=0;
-//     while(table(TBL_SWAPINFO,i,&swbuf,1,sizeof(struct tbl_swapinfo))>0) {
-// 	swappages += swbuf.size;
-// 	swapfree  += swbuf.free;
-// 	i++;
-//     }
-// 
-//     swap_used = pagetok(swappages - swapfree);
-//     swap_free = pagetok(swapfree);
-//     swap_total = pagetok(swappages);
-
     memory_used = pagetok(vmstats.active_count + vmstats.wire_count);
     memory_free = memory_total - memory_used;
     swap_used = pagetok( vmstats.active_count + vmstats.inactive_count + vmstats.wire_count );
diff --git a/casa/OS/Path.cc b/casa/OS/Path.cc
index 10f59db..6243e7b 100644
--- a/casa/OS/Path.cc
+++ b/casa/OS/Path.cc
@@ -142,12 +142,14 @@ const String& Path::absoluteName() const
 
 String Path::resolvedName() const
 {
-    char name[PATH_MAX+1];
-    char* ptr = realpath (absoluteName().c_str(), name);
+    char* ptr = realpath (absoluteName().c_str(), NULL);
     if (ptr == 0) {
         throw AipsError("resolvedName(" + absoluteName() + ") failed: " +
                         strerror(errno));
     }
+    char name[strlen(ptr)+1];
+    strcpy(name, ptr);
+    free(ptr);
     return String(name);
 }
 
diff --git a/casa/OS/malloc.cc b/casa/OS/malloc.cc
index 2eb92fa..1a1af8c 100644
--- a/casa/OS/malloc.cc
+++ b/casa/OS/malloc.cc
@@ -27,7 +27,7 @@
 
 #if !defined(AIPS_NO_LEA_MALLOC)
 
-#if !defined(AIPS_LINUX)
+#if !defined(AIPS_LINUX) && !defined(AIPS_HURD) && !defined(__FreeBSD_kernel__)
 /* Ignore for linux since it already uses gnu malloc! */
 
 /*
diff --git a/casa/aipsenv.h b/casa/aipsenv.h
index 38fb2dd..5f77fc7 100644
--- a/casa/aipsenv.h
+++ b/casa/aipsenv.h
@@ -131,6 +131,13 @@ namespace casacore { //# NAMESPACE CASACORE - BEGIN
 #define AIPS_NOLARGEFILE
 #endif
 
+#if defined(AIPS_HURD)
+#undef AIPS_HURD
+#endif
+#if defined(__gnu_hurd__)
+#define AIPS_HURD
+#endif
+
 #if defined(AIPS_LINUX)
 #undef AIPS_LINUX
 #endif
diff --git a/mirlib/bug.c b/mirlib/bug.c
index be527d4..da99726 100644
--- a/mirlib/bug.c
+++ b/mirlib/bug.c
@@ -333,7 +333,7 @@ char *errmsg_c(int n)
  * this should be removed in favor of HAVE_STRERROR once
  * is only supported using autotools/configure
  */
-#if defined(linux) || (defined(HAVE_STRERROR) && HAVE_STRERROR)
+#if defined(linux) || defined(__GNU__) || (defined(HAVE_STRERROR) && HAVE_STRERROR)
   /* new POSIX.1 style, 20 years old now... (1988) */
   if(n == -1)
     return "End of file detected";