diff options
-rw-r--r-- | devel/boehm-gc-redirect/Makefile | 2 | ||||
-rw-r--r-- | devel/boehm-gc-threaded/Makefile | 2 | ||||
-rw-r--r-- | devel/boehm-gc/Makefile | 12 | ||||
-rw-r--r-- | devel/boehm-gc/distinfo | 6 | ||||
-rw-r--r-- | devel/boehm-gc/files/patch-include_gc_pthread_redirects.h | 15 | ||||
-rw-r--r-- | devel/boehm-gc/files/patch-include_private_gc__priv.h | 11 | ||||
-rw-r--r-- | devel/boehm-gc/files/patch-include_private_gcconfig.h | 16 | ||||
-rw-r--r-- | devel/boehm-gc/pkg-plist | 8 |
8 files changed, 32 insertions, 40 deletions
diff --git a/devel/boehm-gc-redirect/Makefile b/devel/boehm-gc-redirect/Makefile index 0b13c647e239..6e528e22f7f5 100644 --- a/devel/boehm-gc-redirect/Makefile +++ b/devel/boehm-gc-redirect/Makefile @@ -1,8 +1,6 @@ # Created by: stas # $FreeBSD$ -PORTREVISION= 1 - COMMENT= Garbage collection and memory leak detection for C and C++ with malloc redirection LICENSE= MIT diff --git a/devel/boehm-gc-threaded/Makefile b/devel/boehm-gc-threaded/Makefile index 4b009c4cb5da..27d3d58e89f3 100644 --- a/devel/boehm-gc-threaded/Makefile +++ b/devel/boehm-gc-threaded/Makefile @@ -1,8 +1,6 @@ # Created by: stas # $FreeBSD$ -PORTREVISION= 1 - COMMENT= Garbage collection and memory leak detection for C and C++ with threading support LICENSE= MIT diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile index 7db8164e444d..20e0f97ccc65 100644 --- a/devel/boehm-gc/Makefile +++ b/devel/boehm-gc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gc -PORTVERSION= 7.6.0 +PORTVERSION= 7.6.2 CATEGORIES= devel MASTER_SITES= http://www.hboehm.info/gc/gc_source/ PKGNAMEPREFIX= boehm- @@ -10,7 +10,7 @@ PKGNAMEPREFIX= boehm- PKGNAMESUFFIX= -${GC_VARIANT} .endif -MAINTAINER= cpm@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Garbage collection and memory leak detection for C and C++ LICENSE= BDWGC @@ -35,11 +35,15 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/[a-z]$//} OPTIONS_DEFINE= DEBUG .ifdef GC_VARIANT -INSTLIBS= cord gc gccpp +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.0.3,} \ + ${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" diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo index befcdd58bebb..a448e1a0c462 100644 --- a/devel/boehm-gc/distinfo +++ b/devel/boehm-gc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1470671691 -SHA256 (gc-7.6.0.tar.gz) = a14a28b1129be90e55cd6f71127ffc5594e1091d5d54131528c24cd0c03b7d90 -SIZE (gc-7.6.0.tar.gz) = 1111751 +TIMESTAMP = 1514920665 +SHA256 (gc-7.6.2.tar.gz) = bd112005563d787675163b5afff02c364fc8deb13a99c03f4e80fdf6608ad41e +SIZE (gc-7.6.2.tar.gz) = 1119725 diff --git a/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h b/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h new file mode 100644 index 000000000000..4da5304c0e0f --- /dev/null +++ b/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h @@ -0,0 +1,15 @@ +--- 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 diff --git a/devel/boehm-gc/files/patch-include_private_gc__priv.h b/devel/boehm-gc/files/patch-include_private_gc__priv.h deleted file mode 100644 index 6191719b33b3..000000000000 --- a/devel/boehm-gc/files/patch-include_private_gc__priv.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/private/gc_priv.h.orig 2016-08-08 20:30:31 UTC -+++ 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 --git a/devel/boehm-gc/files/patch-include_private_gcconfig.h b/devel/boehm-gc/files/patch-include_private_gcconfig.h index 0a9fede0e39d..c3191a098bf3 100644 --- a/devel/boehm-gc/files/patch-include_private_gcconfig.h +++ b/devel/boehm-gc/files/patch-include_private_gcconfig.h @@ -1,6 +1,6 @@ ---- include/private/gcconfig.h.orig 2016-08-02 19:36:14 UTC +--- include/private/gcconfig.h.orig 2017-12-23 08:46:29 UTC +++ include/private/gcconfig.h -@@ -176,7 +176,7 @@ +@@ -188,7 +188,7 @@ # define EWS4800 # endif # if !defined(LINUX) && !defined(EWS4800) && !defined(NETBSD) \ @@ -9,15 +9,3 @@ # 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 diff --git a/devel/boehm-gc/pkg-plist b/devel/boehm-gc/pkg-plist index 9e8b42cb350b..bb0eb95ef58d 100644 --- a/devel/boehm-gc/pkg-plist +++ b/devel/boehm-gc/pkg-plist @@ -21,12 +21,12 @@ include/gc/weakpointer.h include/gc_cpp.h lib/libcord.so lib/libcord.so.1 -lib/libcord.so.1.0.3 +lib/libcord.so.1.3.0 lib/libgc.so -lib/libgc.so.1 -lib/libgc.so.1.0.3 +lib/libgc.so.2 +lib/libgc.so.2.2.1 lib/libgccpp.so lib/libgccpp.so.1 -lib/libgccpp.so.1.0.3 +lib/libgccpp.so.1.3.0 libdata/pkgconfig/bdw-gc.pc man/man3/gc.3.gz |