CVS commit: pkgsrc/devel/jemalloc

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Mar 22 15:55:17 UTC 2019

Modified Files:
        pkgsrc/devel/jemalloc: distinfo
        pkgsrc/devel/jemalloc/patches: patch-src_pages.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/jemalloc/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/jemalloc/patches/patch-src_pages.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/jemalloc/distinfo
diff -u pkgsrc/devel/jemalloc/distinfo:1.10 pkgsrc/devel/jemalloc/distinfo:1.11
--- pkgsrc/devel/jemalloc/distinfo:1.10 Sun Mar 17 13:28:22 2019
+++ pkgsrc/devel/jemalloc/distinfo      Fri Mar 22 15:55:17 2019
@@ -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 b
 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

Index: pkgsrc/devel/jemalloc/patches/patch-src_pages.c
diff -u pkgsrc/devel/jemalloc/patches/patch-src_pages.c:1.3 pkgsrc/devel/jemalloc/patches/patch-src_pages.c:1.4
--- pkgsrc/devel/jemalloc/patches/patch-src_pages.c:1.3 Sun Mar 17 13:28:22 2019
+++ pkgsrc/devel/jemalloc/patches/patch-src_pages.c     Fri Mar 22 15:55:17 2019
@@ -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