summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrin <rin@pkgsrc.org>2019-03-22 16:30:02 +0000
committerrin <rin@pkgsrc.org>2019-03-22 16:30:02 +0000
commit3a009f540dec80610de34be886906b3073e758d1 (patch)
tree9655450b4d4d04006e0b0a22f4f897f9c5afcb5b
parent650a17347b8ca1295869dce502801ee162627129 (diff)
downloadpkgsrc-3a009f540dec80610de34be886906b3073e758d1.tar.gz
Fix previous; initialize os_overcommits for NetBSD >= 8.0.
-rw-r--r--devel/jemalloc/distinfo4
-rw-r--r--devel/jemalloc/patches/patch-src_pages.c10
2 files changed, 8 insertions, 6 deletions
diff --git a/devel/jemalloc/distinfo b/devel/jemalloc/distinfo
index b1566c3bec4..9279eb38f5b 100644
--- a/devel/jemalloc/distinfo
+++ b/devel/jemalloc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2019/03/22 15:55:17 schmonz Exp $
+$NetBSD: distinfo,v 1.12 2019/03/22 16:30:02 rin Exp $
SHA1 (jemalloc-5.1.0.tar.bz2) = 92fdc0b38680aaee1fa7ccd89cbf1af61224ff46
RMD160 (jemalloc-5.1.0.tar.bz2) = 52b1340ca8cafd7414aa5e3a7a028cb1feba0b80
@@ -7,4 +7,4 @@ Size (jemalloc-5.1.0.tar.bz2) = 515622 bytes
SHA1 (patch-Makefile.in) = 62e04375dec9aab678fed5bc32559deb942e799f
SHA1 (patch-configure) = 5dec3fb5b2ece549e40743780db3057dd83cc17e
SHA1 (patch-include_jemalloc_internal_jemalloc_internal_types.h) = 07f2d661d8141152fc7c80f24f9dab4be90cb4b3
-SHA1 (patch-src_pages.c) = 2ffbe53557a6da99b7438d2ee97a0fac9a50f8fe
+SHA1 (patch-src_pages.c) = 57d5f743efc8d9a5c5e2619b0acde08b3404659c
diff --git a/devel/jemalloc/patches/patch-src_pages.c b/devel/jemalloc/patches/patch-src_pages.c
index 85686fb963f..9232c61eaf3 100644
--- a/devel/jemalloc/patches/patch-src_pages.c
+++ b/devel/jemalloc/patches/patch-src_pages.c
@@ -1,18 +1,20 @@
-$NetBSD: patch-src_pages.c,v 1.4 2019/03/22 15:55:17 schmonz Exp $
+$NetBSD: patch-src_pages.c,v 1.5 2019/03/22 16:30:02 rin Exp $
Set os_overcommits to true on NetBSD < 8.0 as a workaround for
the issue reported in kern/52239 and
https://github.com/jemalloc/jemalloc/issues/837 .
---- src/pages.c.orig 2018-05-08 19:15:01.000000000 +0000
-+++ src/pages.c
-@@ -582,6 +582,10 @@ pages_boot(void) {
+--- src/pages.c.orig 2018-05-09 04:15:01.000000000 +0900
++++ src/pages.c 2019-03-23 01:24:38.101144076 +0900
+@@ -582,6 +582,12 @@ pages_boot(void) {
mmap_flags |= MAP_NORESERVE;
}
# endif
+#elif defined(__NetBSD__)
+# if !__NetBSD_Prereq__(8,0,0)
+ os_overcommits = true;
++# else
++ os_overcommits = false;
+# endif
#else
os_overcommits = false;