CVS commit: pkgsrc/devel/gmake

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Dec 17 14:14:06 UTC 2016

Modified Files:
        pkgsrc/devel/gmake: Makefile distinfo
        pkgsrc/devel/gmake/patches: patch-makeint.h

Log Message:
Do not raise stack limits during the build. It messes up ressource
limits for multi-threaded applications. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 pkgsrc/devel/gmake/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/gmake/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/gmake/patches/patch-makeint.h

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

Modified files:

Index: pkgsrc/devel/gmake/Makefile
diff -u pkgsrc/devel/gmake/Makefile:1.102 pkgsrc/devel/gmake/Makefile:1.103
--- pkgsrc/devel/gmake/Makefile:1.102   Thu Sep  8 20:39:37 2016
+++ pkgsrc/devel/gmake/Makefile Sat Dec 17 14:14:06 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.102 2016/09/08 20:39:37 joerg Exp $
+# $NetBSD: Makefile,v 1.103 2016/12/17 14:14:06 joerg Exp $
 
 DISTNAME=      make-4.1
 PKGNAME=       g${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=make/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/devel/gmake/distinfo
diff -u pkgsrc/devel/gmake/distinfo:1.31 pkgsrc/devel/gmake/distinfo:1.32
--- pkgsrc/devel/gmake/distinfo:1.31    Thu Sep  8 20:39:37 2016
+++ pkgsrc/devel/gmake/distinfo Sat Dec 17 14:14:06 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2016/09/08 20:39:37 joerg Exp $
+$NetBSD: distinfo,v 1.32 2016/12/17 14:14:06 joerg Exp $
 
 SHA1 (make-4.1.tar.bz2) = 0d701882fd6fd61a9652cb8d866ad7fc7de54d58
 RMD160 (make-4.1.tar.bz2) = 0f322d6c28867ea817f7d02c57e635c8ef556909
@@ -6,5 +6,5 @@ SHA512 (make-4.1.tar.bz2) = 3fcaf06660b7
 Size (make-4.1.tar.bz2) = 1327342 bytes
 SHA1 (patch-af) = 8ff060ecba9d664044eabd98741253881d8c9bbe
 SHA1 (patch-main.c) = 6674cc95ce702c06b8214963bcb43bde3919be4f
-SHA1 (patch-makeint.h) = edfb71f3b41bf3bc4c66d948e3001b5502add6c3
+SHA1 (patch-makeint.h) = d4508002620ca35d2661c1b6f8ae0ed3b4771fb1
 SHA1 (patch-pa) = 2c0168db7afec3da98b30392290e5b9464ea7b5e

Index: pkgsrc/devel/gmake/patches/patch-makeint.h
diff -u pkgsrc/devel/gmake/patches/patch-makeint.h:1.5 pkgsrc/devel/gmake/patches/patch-makeint.h:1.6
--- pkgsrc/devel/gmake/patches/patch-makeint.h:1.5      Thu Sep  8 22:46:58 2016
+++ pkgsrc/devel/gmake/patches/patch-makeint.h  Sat Dec 17 14:14:06 2016
@@ -1,10 +1,22 @@
-$NetBSD: patch-makeint.h,v 1.5 2016/09/08 22:46:58 joerg Exp $
+$NetBSD: patch-makeint.h,v 1.6 2016/12/17 14:14:06 joerg Exp $
 
 * [SV 43434] Handle NULL returns from ttyname().
+* Do not override stack limits by default.
+  It can dramatically increase the memory use of multi-threaded programs.
 
 --- makeint.h.orig     2014-10-05 16:24:51.000000000 +0000
 +++ makeint.h
-@@ -424,10 +424,11 @@ extern struct rlimit stack_limit;
+@@ -408,9 +408,6 @@ extern int unixy_shell;
+ 
+ #define STOP_SET(_v,_m) ANY_SET (stopchar_map[(unsigned char)(_v)],(_m))
+ 
+-#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT)
+-# define SET_STACK_SIZE
+-#endif
+ #ifdef SET_STACK_SIZE
+ # include <sys/resource.h>
+ extern struct rlimit stack_limit;
+@@ -424,10 +421,11 @@ extern struct rlimit stack_limit;
  /* The number of bytes needed to represent the largest integer as a string.  */
  #define INTSTR_LENGTH         CSTRLEN ("18446744073709551616")