[pkgsrc/trunk]: pkgsrc/lang/guile guile: SunOS specific changes - don't decla...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee20e7e3ae7e
branches:  trunk
changeset: 354789:ee20e7e3ae7e
user:      maya <maya%pkgsrc.org@localhost>
date:      Thu Nov 10 09:26:21 2016 +0000

description:
guile: SunOS specific changes - don't declare STACKBOTTOM unless
USERLIMIT is given.

>From Brad Forschinger in PR pkg/49787

Also from both boehm-gc commit, where there is a longer description of issues
in issue #122:
https://github.com/ivmai/bdwgc/issues/122
https://github.com/ivmai/bdwgc/commit/81cae56522e601fc2e9e9bab08c87d1302c118fb

we have the additions here (adding the definition of STACKBOTTOM if USERLIMIT
otherwise use HEURISTIC2), but not the removal of the first part, which
declares STACKBOTTOM unconditionally.

Reportedly fixes build on SunOS 5.10 sun4u.

diffstat:

 lang/guile/distinfo         |   4 ++--
 lang/guile/patches/patch-ae |  17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r a15b225fa912 -r ee20e7e3ae7e lang/guile/distinfo
--- a/lang/guile/distinfo       Thu Nov 10 06:15:48 2016 +0000
+++ b/lang/guile/distinfo       Thu Nov 10 09:26:21 2016 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.49 2015/11/03 22:50:36 agc Exp $
+$NetBSD: distinfo,v 1.50 2016/11/10 09:26:21 maya Exp $
 
 SHA1 (guile-1.8.8.tar.gz) = 548d6927aeda332b117f8fc5e4e82c39a05704f9
 RMD160 (guile-1.8.8.tar.gz) = 8ac185a72ad8394b14d5377549e5bbf02889faaa
 SHA512 (guile-1.8.8.tar.gz) = ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0
 Size (guile-1.8.8.tar.gz) = 3956654 bytes
 SHA1 (patch-aa) = 9f697e63f253665c1a1afa3c2827195b9b7638f3
-SHA1 (patch-ae) = e53d126adbc1dc1312d40b3f118bf47591152ce5
+SHA1 (patch-ae) = d7dfd787ce9e89e33ce954de064b81068a1e08f9
 SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
 SHA1 (patch-ah) = 351136075aaaab96117fecc7cedc8ee989d8a1e0
 SHA1 (patch-ak) = 6639ea95471a76893b0b074dcbfbd139a1571309
diff -r a15b225fa912 -r ee20e7e3ae7e lang/guile/patches/patch-ae
--- a/lang/guile/patches/patch-ae       Thu Nov 10 06:15:48 2016 +0000
+++ b/lang/guile/patches/patch-ae       Thu Nov 10 09:26:21 2016 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.17 2013/10/04 18:35:22 joerg Exp $
+$NetBSD: patch-ae,v 1.18 2016/11/10 09:26:21 maya Exp $
 
---- libguile/gc_os_dep.c.orig  2009-06-26 20:21:44.000000000 +0000
+--- libguile/gc_os_dep.c.orig  2010-12-13 17:25:01.000000000 +0000
 +++ libguile/gc_os_dep.c
 @@ -132,7 +132,7 @@ typedef int GC_bool;
  #    define NETBSD
@@ -39,7 +39,16 @@
   *
   * MACH_TYPE is a string representation of the machine type.
   * OS_TYPE is analogous for the OS.
-@@ -720,10 +729,18 @@ scm_get_stack_base ()
+@@ -716,8 +721,6 @@ scm_get_stack_base ()
+ /*      base is a property of the executable, so this should not break  */
+ /*      old executables.                                                */
+ /*      HEURISTIC2 probably works, but this appears to be preferable.   */
+-#       include <sys/vm.h>
+-#       define STACKBOTTOM ((ptr_t) USRSTACK)
+ #     ifndef USE_MMAP
+ #         define USE_MMAP
+ #     endif
+@@ -727,10 +730,18 @@ scm_get_stack_base ()
  #       define HEAP_START DATAEND
  #       endif
  #     define PROC_VDB
@@ -62,7 +71,7 @@
  #     include <unistd.h>
  #       define GETPAGESIZE()  sysconf(_SC_PAGESIZE)
                /* getpagesize() appeared to be missing from at least one */
-@@ -994,6 +1025,21 @@ scm_get_stack_base ()
+@@ -1008,6 +1019,21 @@ scm_get_stack_base ()
  #    endif
  # endif