NetBSD Problem Report #51414
From www@NetBSD.org Sat Aug 13 14:15:33 2016
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
by mollari.NetBSD.org (Postfix) with ESMTPS id 27FFE7A20E
for <gnats-bugs@gnats.NetBSD.org>; Sat, 13 Aug 2016 14:15:33 +0000 (UTC)
Message-Id: <20160813141531.AEED27A2A4@mollari.NetBSD.org>
Date: Sat, 13 Aug 2016 14:15:31 +0000 (UTC)
From: davshao@gmail.com
Reply-To: davshao@gmail.com
To: gnats-bugs@NetBSD.org
Subject: devel/boehm-gc GC_INNER master branch patch for FreeBSD / DragonFly
X-Send-Pr-Version: www-1.0
>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: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Sat Aug 13 14:20:00 +0000 2016
>Closed-Date: Wed Sep 21 18:28:47 +0000 2016
>Last-Modified: Wed Sep 21 18:28:47 +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
>Release-Note:
>Audit-Trail:
From: "Maya Rashish" <maya@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/51414 CVS commit: pkgsrc/devel/boehm-gc
Date: Wed, 21 Sep 2016 17:59:11 +0000
Module Name: pkgsrc
Committed By: maya
Date: Wed Sep 21 17:59:11 UTC 2016
Modified Files:
pkgsrc/devel/boehm-gc: distinfo
Added Files:
pkgsrc/devel/boehm-gc/patches: patch-include_private_gc__priv.h
patch-include_private_gcconfig.h
Log Message:
boehm-gc: apply upstream build fix for FreeBSD/DragonflyBSD.
Requested by David Shao in PR pkg/51414
from upstream commit:
https://github.com/ivmai/bdwgc/commit/6f4e123e34c2e20343a84b6fadd17bde0e7b354c
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/devel/boehm-gc/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/devel/boehm-gc/patches/patch-include_private_gc__priv.h \
pkgsrc/devel/boehm-gc/patches/patch-include_private_gcconfig.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->closed
State-Changed-By: maya@NetBSD.org
State-Changed-When: Wed, 21 Sep 2016 18:28:47 +0000
State-Changed-Why:
Applied, thanks for the patch.
I can't test it on freebsd readily, let me know
if there are other issues.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2014
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.