Sun Mar 17 13:28:22 2019 UTC ()
Bump revision in order to make it easier to compare with
local jemalloc of NetBSD:

- restrict "os_overcommits" workaround to NetBSD < 8.0

- add debug option


(rin)
diff -r1.12 -r1.13 pkgsrc/devel/jemalloc/Makefile
diff -r1.9 -r1.10 pkgsrc/devel/jemalloc/distinfo
diff -r0 -r1.1 pkgsrc/devel/jemalloc/options.mk
diff -r1.2 -r1.3 pkgsrc/devel/jemalloc/patches/patch-src_pages.c
cvs diff -r1.12 -r1.13 pkgsrc/devel/jemalloc/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/jemalloc/Makefile 2018/08/22 09:43:31 1.12
+++ pkgsrc/devel/jemalloc/Makefile 2019/03/17 13:28:22 1.13
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.12 2018/08/22 09:43:31 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2019/03/17 13:28:22 rin Exp $
2 2
3DISTNAME= jemalloc-5.1.0 3DISTNAME= jemalloc-5.1.0
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=jemalloc/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=jemalloc/}
7GITHUB_RELEASE= ${PKGVERSION_NOREV} 7GITHUB_RELEASE= ${PKGVERSION_NOREV}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= gson@NetBSD.org 10MAINTAINER= gson@NetBSD.org
11HOMEPAGE= http://jemalloc.net/ 11HOMEPAGE= http://jemalloc.net/
12COMMENT= General purpose malloc(3) implementation 12COMMENT= General purpose malloc(3) implementation
13LICENSE= 2-clause-bsd 13LICENSE= 2-clause-bsd
14 14
15BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 15BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
16BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 16BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
17 17
@@ -19,14 +19,16 @@ USE_LANGUAGES= c @@ -19,14 +19,16 @@ USE_LANGUAGES= c
19USE_TOOLS+= autoconf automake aclocal gmake perl:run 19USE_TOOLS+= autoconf automake aclocal gmake perl:run
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21CONFIGURE_ARGS+= --enable-cc-silence 21CONFIGURE_ARGS+= --enable-cc-silence
22CONFIGURE_ARGS+= --enable-xmalloc 22CONFIGURE_ARGS+= --enable-xmalloc
23CONFIGURE_ARGS+= --with-xslroot=${PREFIX}/share/xsl/docbook/ 23CONFIGURE_ARGS+= --with-xslroot=${PREFIX}/share/xsl/docbook/
24PKGCONFIG_OVERRIDE= jemalloc.pc.in 24PKGCONFIG_OVERRIDE= jemalloc.pc.in
25 25
26REPLACE_PERL= bin/jeprof.in 26REPLACE_PERL= bin/jeprof.in
27 27
28BUILD_TARGET= all dist 28BUILD_TARGET= all dist
29TEST_TARGET= check 29TEST_TARGET= check
30TEST_ENV= LD_LIBRARY_PATH=${WRKSRC}/lib 30TEST_ENV= LD_LIBRARY_PATH=${WRKSRC}/lib
31 31
 32.include "options.mk"
 33
32.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/devel/jemalloc/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/jemalloc/distinfo 2019/02/17 08:40:08 1.9
+++ pkgsrc/devel/jemalloc/distinfo 2019/03/17 13:28:22 1.10
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.9 2019/02/17 08:40:08 mrg Exp $ 1$NetBSD: distinfo,v 1.10 2019/03/17 13:28:22 rin 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) = 7c9eea2409b283c5dd80e52349c4dda26ae5befa 10SHA1 (patch-src_pages.c) = 12cf807a946e68f7cc247549762a301633b86f9e
File Added: pkgsrc/devel/jemalloc/options.mk
# $NetBSD: options.mk,v 1.1 2019/03/17 13:28:22 rin Exp $

PKG_OPTIONS_VAR=		PKG_OPTIONS.jemalloc
PKG_SUPPORTED_OPTIONS=		debug

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS+=	--enable-debug
.endif
cvs diff -r1.2 -r1.3 pkgsrc/devel/jemalloc/patches/patch-src_pages.c (expand / switch to unified diff)

--- pkgsrc/devel/jemalloc/patches/patch-src_pages.c 2017/08/27 12:12:25 1.2
+++ pkgsrc/devel/jemalloc/patches/patch-src_pages.c 2019/03/17 13:28:22 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-src_pages.c,v 1.2 2017/08/27 12:12:25 adam Exp $ 1$NetBSD: patch-src_pages.c,v 1.3 2019/03/17 13:28:22 rin Exp $
2 2
3Set os_overcommits to true on NetBSD since NetBSD does overcommit. 3Set os_overcommits to true on NetBSD < 8.0 as a workaround for
4This also has the benefit of not triggering the issue reported in 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 2017-07-02 00:44:25.000000000 +0000 7--- src/pages.c.orig 2018-05-09 04:15:01.000000000 +0900
8+++ src/pages.c 8+++ src/pages.c 2019-03-17 22:02:09.325743870 +0900
9@@ -414,6 +414,8 @@ pages_boot(void) { 9@@ -582,6 +582,8 @@ pages_boot(void) {
10 mmap_flags |= MAP_NORESERVE; 10 mmap_flags |= MAP_NORESERVE;
11 } 11 }
12 # endif 12 # endif
13+#elif defined __NetBSD__ 13+#elif defined(__NetBSD__) && !__NetBSD_Prereq__(8,0,0)
14+ os_overcommits = true; 14+ os_overcommits = true;
15 #else 15 #else
16 os_overcommits = false; 16 os_overcommits = false;
17 #endif 17 #endif