Fri Mar 22 15:55:17 2019 UTC ()
Fix "token is not a valid binary operator in a preprocessor
subexpression" on OS X by nesting the "!__NetBSD_Prereq__(8,0,0)"
check in another #if.


(schmonz)
diff -r1.10 -r1.11 pkgsrc/devel/jemalloc/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/jemalloc/patches/patch-src_pages.c
cvs diff -r1.10 -r1.11 pkgsrc/devel/jemalloc/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/jemalloc/distinfo 2019/03/17 13:28:22 1.10
+++ pkgsrc/devel/jemalloc/distinfo 2019/03/22 15:55:17 1.11
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.10 2019/03/17 13:28:22 rin Exp $ 1$NetBSD: distinfo,v 1.11 2019/03/22 15:55:17 schmonz Exp $
2 2
3SHA1 (jemalloc-5.1.0.tar.bz2) = 92fdc0b38680aaee1fa7ccd89cbf1af61224ff46 3SHA1 (jemalloc-5.1.0.tar.bz2) = 92fdc0b38680aaee1fa7ccd89cbf1af61224ff46
4RMD160 (jemalloc-5.1.0.tar.bz2) = 52b1340ca8cafd7414aa5e3a7a028cb1feba0b80 4RMD160 (jemalloc-5.1.0.tar.bz2) = 52b1340ca8cafd7414aa5e3a7a028cb1feba0b80
5SHA512 (jemalloc-5.1.0.tar.bz2) = d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f 5SHA512 (jemalloc-5.1.0.tar.bz2) = d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f
6Size (jemalloc-5.1.0.tar.bz2) = 515622 bytes 6Size (jemalloc-5.1.0.tar.bz2) = 515622 bytes
7SHA1 (patch-Makefile.in) = 62e04375dec9aab678fed5bc32559deb942e799f 7SHA1 (patch-Makefile.in) = 62e04375dec9aab678fed5bc32559deb942e799f
8SHA1 (patch-configure) = 5dec3fb5b2ece549e40743780db3057dd83cc17e 8SHA1 (patch-configure) = 5dec3fb5b2ece549e40743780db3057dd83cc17e
9SHA1 (patch-include_jemalloc_internal_jemalloc_internal_types.h) = 07f2d661d8141152fc7c80f24f9dab4be90cb4b3 9SHA1 (patch-include_jemalloc_internal_jemalloc_internal_types.h) = 07f2d661d8141152fc7c80f24f9dab4be90cb4b3
10SHA1 (patch-src_pages.c) = 12cf807a946e68f7cc247549762a301633b86f9e 10SHA1 (patch-src_pages.c) = 2ffbe53557a6da99b7438d2ee97a0fac9a50f8fe
cvs diff -r1.3 -r1.4 pkgsrc/devel/jemalloc/patches/patch-src_pages.c (expand / switch to unified diff)

--- pkgsrc/devel/jemalloc/patches/patch-src_pages.c 2019/03/17 13:28:22 1.3
+++ pkgsrc/devel/jemalloc/patches/patch-src_pages.c 2019/03/22 15:55:17 1.4
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1$NetBSD: patch-src_pages.c,v 1.3 2019/03/17 13:28:22 rin Exp $ 1$NetBSD: patch-src_pages.c,v 1.4 2019/03/22 15:55:17 schmonz Exp $
2 2
3Set os_overcommits to true on NetBSD < 8.0 as a workaround for 3Set os_overcommits to true on NetBSD < 8.0 as a workaround for
4the issue reported in kern/52239 and 4the issue reported in kern/52239 and
5https://github.com/jemalloc/jemalloc/issues/837 . 5https://github.com/jemalloc/jemalloc/issues/837 .
6 6
7--- src/pages.c.orig 2018-05-09 04:15:01.000000000 +0900 7--- src/pages.c.orig 2018-05-08 19:15:01.000000000 +0000
8+++ src/pages.c 2019-03-17 22:02:09.325743870 +0900 8+++ src/pages.c
9@@ -582,6 +582,8 @@ pages_boot(void) { 9@@ -582,6 +582,10 @@ pages_boot(void) {
10 mmap_flags |= MAP_NORESERVE; 10 mmap_flags |= MAP_NORESERVE;
11 } 11 }
12 # endif 12 # endif
13+#elif defined(__NetBSD__) && !__NetBSD_Prereq__(8,0,0) 13+#elif defined(__NetBSD__)
 14+# if !__NetBSD_Prereq__(8,0,0)
14+ os_overcommits = true; 15+ os_overcommits = true;
 16+# endif
15 #else 17 #else
16 os_overcommits = false; 18 os_overcommits = false;
17 #endif 19 #endif