summaryrefslogtreecommitdiff
path: root/filesystems
diff options
context:
space:
mode:
authormanu <manu@pkgsrc.org>2018-08-06 02:17:04 +0000
committermanu <manu@pkgsrc.org>2018-08-06 02:17:04 +0000
commit274db956f08a3360c22ad21f240756e130f29f63 (patch)
treeb2a7cdc30904ef35c57871354e87ad09ab9422f9 /filesystems
parente1a1e4c135c4720473043693b7e66c6e22dff555 (diff)
downloadpkgsrc-274db956f08a3360c22ad21f240756e130f29f63.tar.gz
Make NetBSD memory reading routine 64-bit aware
Diffstat (limited to 'filesystems')
-rw-r--r--filesystems/glusterfs/distinfo3
-rw-r--r--filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c29
2 files changed, 31 insertions, 1 deletions
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index 659e949e004..ba519dbed21 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.64 2018/04/19 02:49:04 manu Exp $
+$NetBSD: distinfo,v 1.65 2018/08/06 02:17:04 manu Exp $
SHA1 (glusterfs-3.12.8.tar.gz) = 9e8ab7a86c1a3eb476816c908718ad57753406ac
RMD160 (glusterfs-3.12.8.tar.gz) = d0e09f748893829f85f6570eaad977f545745115
SHA512 (glusterfs-3.12.8.tar.gz) = 4dfe00704489e5ce1c599d691105081c14f85209319c829d82e783fec09a4544e078dc956db5dce1d130e8fcc4e617b1dfecf915f9239e250869dc0cb2ef4397
Size (glusterfs-3.12.8.tar.gz) = 7389786 bytes
+SHA1 (patch-libglusterfs_src_common-utils.c) = d33765dcc17907f3af0cc9954f5920abb6365e48
diff --git a/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c b/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c
new file mode 100644
index 00000000000..803e3047fcd
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c
@@ -0,0 +1,29 @@
+--- 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