Mon Aug 6 02:17:04 2018 UTC ()
Make NetBSD memory reading routine 64-bit aware
(manu)
diff -r1.64 -r1.65 pkgsrc/filesystems/glusterfs/distinfo
diff -r0 -r1.1 pkgsrc/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c
--- pkgsrc/filesystems/glusterfs/distinfo 2018/04/19 02:49:04 1.64
+++ pkgsrc/filesystems/glusterfs/distinfo 2018/08/06 02:17:04 1.65
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.64 2018/04/19 02:49:04 manu Exp $ | | 1 | $NetBSD: distinfo,v 1.65 2018/08/06 02:17:04 manu Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (glusterfs-3.12.8.tar.gz) = 9e8ab7a86c1a3eb476816c908718ad57753406ac | | 3 | SHA1 (glusterfs-3.12.8.tar.gz) = 9e8ab7a86c1a3eb476816c908718ad57753406ac |
| 4 | RMD160 (glusterfs-3.12.8.tar.gz) = d0e09f748893829f85f6570eaad977f545745115 | | 4 | RMD160 (glusterfs-3.12.8.tar.gz) = d0e09f748893829f85f6570eaad977f545745115 |
| 5 | SHA512 (glusterfs-3.12.8.tar.gz) = 4dfe00704489e5ce1c599d691105081c14f85209319c829d82e783fec09a4544e078dc956db5dce1d130e8fcc4e617b1dfecf915f9239e250869dc0cb2ef4397 | | 5 | SHA512 (glusterfs-3.12.8.tar.gz) = 4dfe00704489e5ce1c599d691105081c14f85209319c829d82e783fec09a4544e078dc956db5dce1d130e8fcc4e617b1dfecf915f9239e250869dc0cb2ef4397 |
| 6 | Size (glusterfs-3.12.8.tar.gz) = 7389786 bytes | | 6 | Size (glusterfs-3.12.8.tar.gz) = 7389786 bytes |
| | | 7 | SHA1 (patch-libglusterfs_src_common-utils.c) = d33765dcc17907f3af0cc9954f5920abb6365e48 |
--- libglusterfs/src/common-utils.c.orig 2018-08-05 19:00:57.102350607 +0200
+++ libglusterfs/src/common-utils.c 2018-08-05 19:21:38.677872008 +0200
@@ -2970,15 +2970,25 @@
memsize = page_size * num_pages;
#endif
-#if defined GF_BSD_HOST_OS || defined GF_DARWIN_HOST_OS
+#if defined GF_DARWIN_HOST_OS
size_t len = sizeof(memsize);
int name [] = { CTL_HW, HW_PHYSMEM };
sysctl (name, 2, &memsize, &len, NULL, 0);
#endif
+
+#if defined __NetBSD__
+
+ size_t len = sizeof(memsize);
+ int name64 [] = { CTL_HW, HW_PHYSMEM64 };
+
+ sysctl (name64, 2, &memsize, &len, NULL, 0);
+ if (memsize == -1)
+ sysctl (name64, 2, &memsize, &len, NULL, 0);
+#endif
return memsize;
}
/* Strips all whitespace characters in a string and returns length of new string