Attachment #189400 for bug #224848




# $FreeBSD$

PORTNAME=	gc
PORTVERSION=	7.6.2
CATEGORIES=	devel
MASTER_SITES=	http://www.hboehm.info/gc/gc_source/
PKGNAMEPREFIX=	boehm-

PKGNAMESUFFIX=	-${GC_VARIANT}
.endif

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Garbage collection and memory leak detection for C and C++

LICENSE=	BDWGC

OPTIONS_DEFINE=	DEBUG

.ifdef GC_VARIANT
INSTLIBS=	cord gccpp
GCLIBS=		gc
PLIST=		${NONEXISTENT}
PLIST_FILES=	${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
		${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
		${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.3.0,} \
		${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
		${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.2,} \
		${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.2.2.1,} \
		libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
RUN_DEPENDS+=	${LOCALBASE}/include/gc/gc.h:devel/boehm-gc
. if ${GC_VARIANT} == "redirect"

Lines 1-3 Link Here

(-)devel/boehm-gc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1470671691	1	TIMESTAMP = 1514920665
2	SHA256 (gc-7.6.0.tar.gz) = a14a28b1129be90e55cd6f71127ffc5594e1091d5d54131528c24cd0c03b7d90	2	SHA256 (gc-7.6.2.tar.gz) = bd112005563d787675163b5afff02c364fc8deb13a99c03f4e80fdf6608ad41e
3	SIZE (gc-7.6.0.tar.gz) = 1111751	3	SIZE (gc-7.6.2.tar.gz) = 1119725




--- include/gc_pthread_redirects.h.orig	2018-01-04 15:41:42.535207000 +0100
+++ include/gc_pthread_redirects.h	2018-01-04 15:42:01.806411000 +0100
@@ -44,12 +44,8 @@
 
 # ifndef GC_NO_PTHREAD_SIGMASK
 #   include <signal.h>  /* needed anyway for proper redirection */
-#   if defined(GC_PTHREAD_SIGMASK_NEEDED) \
-        || defined(_BSD_SOURCE) || defined(_GNU_SOURCE) \
-        || (_POSIX_C_SOURCE >= 199506L) || (_XOPEN_SOURCE >= 500)
       GC_API int GC_pthread_sigmask(int /* how */, const sigset_t *,
                                     sigset_t * /* oset */);
-#   endif
 # endif /* !GC_NO_PTHREAD_SIGMASK */
 
 # ifndef GC_PTHREAD_CREATE_CONST

Lines 1-11 Link Here

(-)devel/boehm-gc/files/patch-include_private_gc__priv.h (-11 lines)
1	--- include/private/gc_priv.h.orig 2016-08-08 20:30:31 UTC
2	+++ include/private/gc_priv.h
3	@@ -2500,6 +2500,8 @@ GC_INNER ptr_t GC_store_debug_info(ptr_t
4	# if !defined(PCR)
5	# define NEED_FIND_LIMIT
6	# endif
7	+ GC_INNER ptr_t GC_FreeBSDGetDataStart(size_t, ptr_t);
8	+# define DATASTART_IS_FUNC
9	#endif /* DATASTART_USES_BSDGETDATASTART */
10
11	#if (defined(NETBSD) \|\| defined(OPENBSD)) && defined(__ELF__) \




--- include/private/gcconfig.h.orig	2017-12-23 08:46:29 UTC
+++ include/private/gcconfig.h
@@ -188,7 +188,7 @@
 #      define EWS4800
 #    endif
 #    if !defined(LINUX) && !defined(EWS4800) && !defined(NETBSD) \

 #      if defined(ultrix) || defined(__ultrix)
 #        define ULTRIX
 #      else
@@ -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




include/gc_cpp.h
lib/libcord.so
lib/libcord.so.1
lib/libcord.so.1.3.0
lib/libgc.so
lib/libgc.so.2
lib/libgc.so.2.2.1
lib/libgccpp.so
lib/libgccpp.so.1
lib/libgccpp.so.1.3.0
libdata/pkgconfig/bdw-gc.pc
man/man3/gc.3.gz

Lines 1-8 Link Here

(-)devel/boehm-gc-redirect/Makefile (-2 lines)
1	# Created by: stas	1	# Created by: stas
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTREVISION= 1
5
6	COMMENT= Garbage collection and memory leak detection for C and C++ with malloc redirection	4	COMMENT= Garbage collection and memory leak detection for C and C++ with malloc redirection
7		5
8	LICENSE= MIT	6	LICENSE= MIT

Lines 1-8 Link Here

(-)devel/boehm-gc-threaded/Makefile (-2 lines)
1	# Created by: stas	1	# Created by: stas
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTREVISION= 1
5
6	COMMENT= Garbage collection and memory leak detection for C and C++ with threading support	4	COMMENT= Garbage collection and memory leak detection for C and C++ with threading support
7		5
8	LICENSE= MIT	6	LICENSE= MIT

Return to bug 224848

Lines 2-8 Link Here

(-)devel/boehm-gc/Makefile (-4 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gc	4	PORTNAME= gc
5	PORTVERSION= 7.6.0	5	PORTVERSION= 7.6.2
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= http://www.hboehm.info/gc/gc_source/	7	MASTER_SITES= http://www.hboehm.info/gc/gc_source/
8	PKGNAMEPREFIX= boehm-	8	PKGNAMEPREFIX= boehm-
Lines 10-16 Link Here
10	PKGNAMESUFFIX= -${GC_VARIANT}	10	PKGNAMESUFFIX= -${GC_VARIANT}
11	.endif	11	.endif
12		12
13	MAINTAINER= cpm@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
14	COMMENT= Garbage collection and memory leak detection for C and C++	14	COMMENT= Garbage collection and memory leak detection for C and C++
15		15
16	LICENSE= BDWGC	16	LICENSE= BDWGC
Lines 35-45 Link Here
35	OPTIONS_DEFINE= DEBUG	35	OPTIONS_DEFINE= DEBUG
36		36
37	.ifdef GC_VARIANT	37	.ifdef GC_VARIANT
38	INSTLIBS= cord gc gccpp	38	INSTLIBS= cord gccpp
		39	GCLIBS= gc
39	PLIST= ${NONEXISTENT}	40	PLIST= ${NONEXISTENT}
40	PLIST_FILES= ${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \	41	PLIST_FILES= ${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
41	${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \	42	${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
42	${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.0.3,} \	43	${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.3.0,} \
		44	${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
		45	${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.2,} \
		46	${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.2.2.1,} \
43	libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc	47	libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
44	RUN_DEPENDS+= ${LOCALBASE}/include/gc/gc.h:devel/boehm-gc	48	RUN_DEPENDS+= ${LOCALBASE}/include/gc/gc.h:devel/boehm-gc
45	. if ${GC_VARIANT} == "redirect"	49	. if ${GC_VARIANT} == "redirect"

Line 0 Link Here

(-)devel/boehm-gc/files/patch-include_gc_pthread_redirects.h (+15 lines)
	1	--- include/gc_pthread_redirects.h.orig 2018-01-04 15:41:42.535207000 +0100
	2	+++ include/gc_pthread_redirects.h 2018-01-04 15:42:01.806411000 +0100
	3	@@ -44,12 +44,8 @@
	4
	5	# ifndef GC_NO_PTHREAD_SIGMASK
	6	# include <signal.h> /* needed anyway for proper redirection */
	7	-# if defined(GC_PTHREAD_SIGMASK_NEEDED) \
	8	- \|\| defined(_BSD_SOURCE) \|\| defined(_GNU_SOURCE) \
	9	- \|\| (_POSIX_C_SOURCE >= 199506L) \|\| (_XOPEN_SOURCE >= 500)
	10	GC_API int GC_pthread_sigmask(int /* how /, const sigset_t ,
	11	sigset_t * /* oset */);
	12	-# endif
	13	# endif /* !GC_NO_PTHREAD_SIGMASK */
	14
	15	# ifndef GC_PTHREAD_CREATE_CONST

Lines 1-6 Link Here

(-)devel/boehm-gc/files/patch-include_private_gcconfig.h (-14 / +2 lines)
1	--- include/private/gcconfig.h.orig 2016-08-02 19:36:14 UTC	1	--- include/private/gcconfig.h.orig 2017-12-23 08:46:29 UTC
2	+++ include/private/gcconfig.h	2	+++ include/private/gcconfig.h
3	@@ -176,7 +176,7 @@	3	@@ -188,7 +188,7 @@
4	# define EWS4800	4	# define EWS4800
5	# endif	5	# endif
6	# if !defined(LINUX) && !defined(EWS4800) && !defined(NETBSD) \	6	# if !defined(LINUX) && !defined(EWS4800) && !defined(NETBSD) \
Lines 9-23 Link Here
9	# if defined(ultrix) \|\| defined(__ultrix)	9	# if defined(ultrix) \|\| defined(__ultrix)
10	# define ULTRIX	10	# define ULTRIX
11	# else	11	# else
12	@@ -2745,11 +2745,6 @@
13	# define SUNOS5SIGS
14	#endif
15
16	-#ifdef DATASTART_USES_BSDGETDATASTART
17	- GC_INNER ptr_t GC_FreeBSDGetDataStart(size_t, ptr_t);
18	-# define DATASTART_IS_FUNC
19	-#endif
20	-
21	#if !defined(GC_EXPLICIT_SIGNALS_UNBLOCK) && defined(SUNOS5SIGS) \
22	&& !defined(GC_NO_PTHREAD_SIGMASK)
23	# define GC_EXPLICIT_SIGNALS_UNBLOCK

Lines 21-32 Link Here

(-)devel/boehm-gc/pkg-plist (-4 / +4 lines)
21	include/gc_cpp.h	21	include/gc_cpp.h
22	lib/libcord.so	22	lib/libcord.so
23	lib/libcord.so.1	23	lib/libcord.so.1
24	lib/libcord.so.1.0.3	24	lib/libcord.so.1.3.0
25	lib/libgc.so	25	lib/libgc.so
26	lib/libgc.so.1	26	lib/libgc.so.2
27	lib/libgc.so.1.0.3	27	lib/libgc.so.2.2.1
28	lib/libgccpp.so	28	lib/libgccpp.so
29	lib/libgccpp.so.1	29	lib/libgccpp.so.1
30	lib/libgccpp.so.1.0.3	30	lib/libgccpp.so.1.3.0
31	libdata/pkgconfig/bdw-gc.pc	31	libdata/pkgconfig/bdw-gc.pc
32	man/man3/gc.3.gz	32	man/man3/gc.3.gz