Index: head/devel/boehm-gc/Makefile =================================================================== --- head/devel/boehm-gc/Makefile (revision 419896) +++ head/devel/boehm-gc/Makefile (revision 419897) @@ -1,105 +1,105 @@ # Created by: Mike McGaughey # $FreeBSD$ PORTNAME= gc -PORTVERSION= 7.4.4 +PORTVERSION= 7.6.0 CATEGORIES= devel MASTER_SITES= http://www.hboehm.info/gc/gc_source/ PKGNAMEPREFIX= boehm- .ifdef GC_VARIANT PKGNAMESUFFIX= -${GC_VARIANT} .endif MAINTAINER= cpm@FreeBSD.org COMMENT= Garbage collection and memory leak detection for C and C++ LICENSE= BDWGC LICENSE_NAME= Boehm-Demers-Weiser Garbage Collector License LICENSE_TEXT= License can be found at http://www.hboehm.info/gc/license.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops GNU_CONFIGURE= yes USES= cpe libtool pathfix pkgconfig CPE_VENDOR= boehm-demers-weiser CPE_PRODUCT= garbage_collector USE_LDCONFIG= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --enable-cplusplus --disable-static MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/${DISTNAME:C/[a-z]$//} OPTIONS_DEFINE= DEBUG .ifdef GC_VARIANT INSTLIBS= cord gc gccpp 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.0.3,} \ libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc RUN_DEPENDS+= ${LOCALBASE}/include/gc/gc.h:devel/boehm-gc . if ${GC_VARIANT} == "redirect" CONFIGURE_ARGS+=--disable-threads --enable-redirect-malloc . endif . if ${GC_VARIANT} == "threaded" CONFIGURE_ARGS+=--enable-threads=posix --disable-redirect-malloc OPTIONS_DEFINE+=PARALLEL_MARK PARALLEL_MARK_DESC= Parallel-thread marking (faster for SMP) . endif .else CONFIGURE_ARGS+=--disable-threads --disable-redirect-malloc OPTIONS_DEFINE+=DOCS PORTDOCS= * .endif NOT_FOR_ARCHS= ia64 .include .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-gc-debug PKGNAMESUFFIX:= ${PKGNAMESUFFIX}+fulldebug .endif .if defined(GC_VARIANT) && ${GC_VARIANT} == "threaded" . if ${PORT_OPTIONS:MPARALLEL_MARK} CONFIGURE_ARGS+=--enable-parallel-mark . endif .endif .ifdef GC_VARIANT post-patch: @${REINPLACE_CMD} -e \ 's,libgc\.la,libgc-${GC_VARIANT}.la,g ; \ s,libgccpp\.la,libgccpp-${GC_VARIANT}.la,g ; \ s,libcord\.la,libcord-${GC_VARIANT}.la,g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in post-install: ${RM} -r ${STAGEDIR}${PREFIX}/include ${RM} -r ${STAGEDIR}${PREFIX}/share ${MV} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc .else # ! GC_VARIANT post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/gc.man @${REINPLACE_CMD} \ -e "s|(datadir)/@PACKAGE@|(datadir)/doc/@PACKAGE@|" \ ${WRKSRC}/Makefile.in post-install: ${INSTALL_MAN} ${WRKSRC}/doc/gc.man ${STAGEDIR}${MAN3PREFIX}/man/man3/gc.3 @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .endif regression-test: build (cd ${WRKSRC} && ${MAKE_CMD} check) .include Index: head/devel/boehm-gc/distinfo =================================================================== --- head/devel/boehm-gc/distinfo (revision 419896) +++ head/devel/boehm-gc/distinfo (revision 419897) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465514922 -SHA256 (gc-7.4.4.tar.gz) = e5ca9b628b765076b6ab26f882af3a1a29cde786341e08b9f366604f74e4db84 -SIZE (gc-7.4.4.tar.gz) = 1103245 +TIMESTAMP = 1470671691 +SHA256 (gc-7.6.0.tar.gz) = a14a28b1129be90e55cd6f71127ffc5594e1091d5d54131528c24cd0c03b7d90 +SIZE (gc-7.6.0.tar.gz) = 1111751 Index: head/devel/boehm-gc/files/patch-os__dep.c =================================================================== --- head/devel/boehm-gc/files/patch-os__dep.c (revision 419896) +++ head/devel/boehm-gc/files/patch-os__dep.c (nonexistent) @@ -1,21 +0,0 @@ ---- os_dep.c.orig 2014-06-03 06:08:02 UTC -+++ os_dep.c -@@ -1869,7 +1869,8 @@ void GC_register_data_segments(void) - # endif - - # if defined(FREEBSD) && !defined(PCR) && (defined(I386) || defined(X86_64) \ -- || defined(powerpc) || defined(__powerpc__)) -+ || defined(powerpc) || defined(__powerpc__) \ -+ || defined(__aarch64__)) - - /* Its unclear whether this should be identical to the above, or */ - /* whether it should apply to non-X86 architectures. */ -@@ -3094,6 +3095,8 @@ GC_API GC_push_other_roots_proc GC_CALL - # include - # define CODE_OK (si -> si_code == EXC_DSI \ - || si -> si_code == SEGV_ACCERR) -+# elif defined(AARCH64) -+# define CODE_OK (si -> si_code == SEGV_ACCERR) - # else - # define CODE_OK (si -> si_code == BUS_PAGE_FAULT \ - || si -> si_code == SEGV_ACCERR) Property changes on: head/devel/boehm-gc/files/patch-os__dep.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/boehm-gc/files/patch-include_private_gc__priv.h =================================================================== --- head/devel/boehm-gc/files/patch-include_private_gc__priv.h (revision 419896) +++ head/devel/boehm-gc/files/patch-include_private_gc__priv.h (revision 419897) @@ -1,13 +1,11 @@ ---- include/private/gc_priv.h.orig 2014-06-03 06:08:02 UTC +--- include/private/gc_priv.h.orig 2016-08-08 20:30:31 UTC +++ include/private/gc_priv.h -@@ -2461,7 +2461,9 @@ GC_INNER ptr_t GC_store_debug_info(ptr_t - #endif - - #if defined(FREEBSD) && (defined(I386) || defined(X86_64) \ -- || defined(powerpc) || defined(__powerpc__)) -+ || defined(powerpc) || defined(__powerpc__) \ -+ || defined(__aarch64__)) -+ - # include +@@ -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__) \ Index: head/devel/boehm-gc/files/patch-include_private_gcconfig.h =================================================================== --- head/devel/boehm-gc/files/patch-include_private_gcconfig.h (revision 419896) +++ head/devel/boehm-gc/files/patch-include_private_gcconfig.h (revision 419897) @@ -1,79 +1,14 @@ ---- include/private/gcconfig.h.orig 2014-06-03 06:08:02 UTC +--- include/private/gcconfig.h.orig 2016-08-08 20:30:40 UTC +++ include/private/gcconfig.h -@@ -97,7 +97,7 @@ - # endif - # if defined(__aarch64__) - # define AARCH64 --# if !defined(LINUX) -+# if !defined(LINUX) && !defined(FREEBSD) - # define NOSYS - # define mach_type_known - # endif -@@ -169,7 +169,7 @@ - # define EWS4800 - # endif - # if !defined(LINUX) && !defined(EWS4800) && !defined(NETBSD) \ -- && !defined(OPENBSD) -+ && !defined(OPENBSD) && !defined(FREEBSD) - # if defined(ultrix) || defined(__ultrix) - # define ULTRIX - # else -@@ -402,6 +402,10 @@ - # define I386 - # define mach_type_known - # endif -+# if defined(FREEBSD) && defined(__aarch64__) -+# define AARCH64 -+# define mach_type_known -+# endif - # if defined(FREEBSD) && (defined(__amd64__) || defined(__x86_64__)) - # define X86_64 - # define mach_type_known -@@ -1647,6 +1651,26 @@ - # define DATAEND ((ptr_t)(&_end)) - # define DYNAMIC_LOADING - # endif -+# ifdef FREEBSD -+# define OS_TYPE "FREEBSD" -+# define ALIGNMENT 4 -+# define SIG_SUSPEND SIGUSR1 -+# define SIG_THR_RESTART SIGUSR2 -+# define FREEBSD_STACKBOTTOM -+# ifdef __ELF__ -+# define DYNAMIC_LOADING -+# endif -+ extern char etext[]; -+ extern char edata[]; -+ extern char end[]; -+# define NEED_FIND_LIMIT -+# define DATASTART ((ptr_t)(&etext)) -+ ptr_t GC_find_limit(ptr_t, GC_bool); -+# define DATAEND (GC_find_limit (DATASTART, TRUE)) -+# define DATAEND_IS_FUNC -+# define DATASTART2 ((ptr_t)(&edata)) -+# define DATAEND2 ((ptr_t)(&end)) -+# endif - # if defined(NONSTOP) - # define CPP_WORDSZ 32 - # define OS_TYPE "NONSTOP" -@@ -1998,6 +2022,20 @@ - extern char _end[]; - # define DATAEND ((ptr_t)(&_end)) - # endif -+# ifdef FREEBSD -+# define OS_TYPE "FREEBSD" -+# ifndef GC_FREEBSD_THREADS -+# define MPROTECT_VDB -+# endif -+# define FREEBSD_STACKBOTTOM -+# ifdef __ELF__ -+# define DYNAMIC_LOADING -+# endif -+ extern char etext[]; -+ ptr_t GC_FreeBSDGetDataStart(size_t, ptr_t); -+# define DATASTART GC_FreeBSDGetDataStart(0x1000, (ptr_t)etext) -+# define DATASTART_IS_FUNC -+# endif - # ifdef NOSYS - /* __data_start is usually defined in the target linker script. */ - extern int __data_start[]; +@@ -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