pkg/51414: devel/boehm-gc GC_INNER master branch patch for FreeBSD / DragonFly

[davshao%gmail.com@localhost]

>Number:         51414
>Category:       pkg
>Synopsis:       devel/boehm-gc GC_INNER master branch patch for FreeBSD / DragonFly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Aug 13 14:20:00 +0000 2016
>Originator:     David Shao
>Release:        current pkgsrc cvs
>Organization:
>Environment:
DragonFly  4.7-DEVELOPMENT DragonFly v4.7.0.170.g08cfa-DEVELOPMENT #0: Sat Aug 13 04:15:21 PDT 2016     xxxxxx@:/usr/obj/usr/src/sys/X86_64_GENERIC  x86_64
>Description:
After the recent upgrade to boehm-gc 7.6.0 in current pkgsrc cvs, compilation fails similar to the boehm-gc bug report:

https://github.com/ivmai/bdwgc/issues/132

Cherry picking the following fix committed to the master branch just 4 days ago allows compilation, build, and replacement to succeed on DragonFly 4.7.0:

https://github.com/ivmai/bdwgc/commit/6f4e123e34c2e20343a84b6fadd17bde0e7b354c


>How-To-Repeat:

>Fix:
The following patches are cherry picked from boehm-gc's master branch and converted to pkgsrc format, although hopefully this web form and my cutting and pasting did not mangle the patches:


diff -Nur boehm-gc.orig/patches/patch-include_private_gc__priv.h boehm-gc/patches/patch-include_private_gc__priv.h
--- boehm-gc.orig/patches/patch-include_private_gc__priv.h      1969-12-31 16:00:00.000000000 -0800
+++ boehm-gc/patches/patch-include_private_gc__priv.h   2016-08-13 06:46:52.690604000 -0700
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- include/private/gc_priv.h.orig     2016-08-02 19:36:14.000000000 +0000
++++ include/private/gc_priv.h
+@@ -2500,6 +2500,8 @@ GC_INNER ptr_t GC_store_debug_info(ptr_t
+ # if !defined(PCR)
+ #   define NEED_FIND_LIMIT
+ # endif
++  GC_INNER ptr_t GC_FreeBSDGetDataStart(size_t, ptr_t);
++# define DATASTART_IS_FUNC
+ #endif /* DATASTART_USES_BSDGETDATASTART */
+ 
+ #if (defined(NETBSD) || defined(OPENBSD)) && defined(__ELF__) \
diff -Nur boehm-gc.orig/patches/patch-include_private_gcconfig.h boehm-gc/patches/patch-include_private_gcconfig.h
--- boehm-gc.orig/patches/patch-include_private_gcconfig.h      1969-12-31 16:00:00.000000000 -0800
+++ boehm-gc/patches/patch-include_private_gcconfig.h   2016-08-13 06:46:52.710604000 -0700
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- include/private/gcconfig.h.orig    2016-08-02 19:36:14.000000000 +0000
++++ include/private/gcconfig.h
+@@ -2745,11 +2745,6 @@
+ # define SUNOS5SIGS
+ #endif
+ 
+-#ifdef DATASTART_USES_BSDGETDATASTART
+-  GC_INNER ptr_t GC_FreeBSDGetDataStart(size_t, ptr_t);
+-# define DATASTART_IS_FUNC
+-#endif
+-
+ #if !defined(GC_EXPLICIT_SIGNALS_UNBLOCK) && defined(SUNOS5SIGS) \
+     && !defined(GC_NO_PTHREAD_SIGMASK)
+ # define GC_EXPLICIT_SIGNALS_UNBLOCK