diff options
| author | schmonz <schmonz@pkgsrc.org> | 2019-03-22 15:55:17 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2019-03-22 15:55:17 +0000 |
| commit | f449cc37f029edb79aae1d34c89fac92dcced75f (patch) | |
| tree | 6f83e4c18565b80d2637be782b86cc5ae810db1c /devel/jemalloc | |
| parent | e69fc80cd49d8cc6553e022617a0b8319b466d89 (diff) | |
| download | pkgsrc-f449cc37f029edb79aae1d34c89fac92dcced75f.tar.gz | |
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.
Diffstat (limited to 'devel/jemalloc')
| -rw-r--r-- | devel/jemalloc/distinfo | 4 | ||||
| -rw-r--r-- | devel/jemalloc/patches/patch-src_pages.c | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/devel/jemalloc/distinfo b/devel/jemalloc/distinfo index 67d59612f03..b1566c3bec4 100644 --- a/devel/jemalloc/distinfo +++ b/devel/jemalloc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2019/03/17 13:28:22 rin Exp $ +$NetBSD: distinfo,v 1.11 2019/03/22 15:55:17 schmonz 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) = 12cf807a946e68f7cc247549762a301633b86f9e +SHA1 (patch-src_pages.c) = 2ffbe53557a6da99b7438d2ee97a0fac9a50f8fe diff --git a/devel/jemalloc/patches/patch-src_pages.c b/devel/jemalloc/patches/patch-src_pages.c index 0aa4a72a260..85686fb963f 100644 --- a/devel/jemalloc/patches/patch-src_pages.c +++ b/devel/jemalloc/patches/patch-src_pages.c @@ -1,17 +1,19 @@ -$NetBSD: patch-src_pages.c,v 1.3 2019/03/17 13:28:22 rin Exp $ +$NetBSD: patch-src_pages.c,v 1.4 2019/03/22 15:55:17 schmonz 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-09 04:15:01.000000000 +0900 -+++ src/pages.c 2019-03-17 22:02:09.325743870 +0900 -@@ -582,6 +582,8 @@ pages_boot(void) { +--- src/pages.c.orig 2018-05-08 19:15:01.000000000 +0000 ++++ src/pages.c +@@ -582,6 +582,10 @@ pages_boot(void) { mmap_flags |= MAP_NORESERVE; } # endif -+#elif defined(__NetBSD__) && !__NetBSD_Prereq__(8,0,0) ++#elif defined(__NetBSD__) ++# if !__NetBSD_Prereq__(8,0,0) + os_overcommits = true; ++# endif #else os_overcommits = false; #endif |