Hello, Here's a patch to update boehm-gc to v7.6.12 and libatomic_ops to v7.6.10.
gc v7.6.0 was an experimental release not intended for the production code.
From f092b58b230e5d3b0719d88020bb60f03b043711 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski <[email protected]> Date: Tue, 14 May 2019 22:47:57 +0300 Subject: [PATCH] Update to gc-7.6.12 and libatomic_ops-7.6.10 --- devel/boehm-gc/Makefile | 10 ++- devel/boehm-gc/distinfo | 8 +-- devel/boehm-gc/patches/patch-bdw-gc_pc_in | 10 +-- .../patches/patch-include_gc_config_macros_h | 18 +++--- .../patches/patch-include_private_gcconfig_h | 63 ++++++++++--------- devel/boehm-gc/pkg/DESCR-atomic | 8 ++- devel/boehm-gc/pkg/DESCR-main | 2 +- 7 files changed, 61 insertions(+), 58 deletions(-) diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile index 5720377fb8b..dde4b555ea0 100644 --- a/devel/boehm-gc/Makefile +++ b/devel/boehm-gc/Makefile @@ -1,16 +1,15 @@ -# $OpenBSD: Makefile,v 1.70 2018/12/30 17:08:09 pascal Exp $ +# $OpenBSD: Makefile,v 1.71 2019/05/14 00:08:00 ivmai Exp $ COMMENT-main= garbage collection and memory leak detection for C and C++ -COMMENT-atomic= access to hardware provided atomic memory operations +COMMENT-atomic= access to hardware-provided atomic memory operations -VERSION= 7.6.0 -LIBAO_VERSION= 7.6.6 +VERSION= 7.6.12 +LIBAO_VERSION= 7.6.10 DISTNAME= gc-${VERSION} PKGNAME-atomic= libatomic_ops-${LIBAO_VERSION} PKGNAME-main= boehm-gc-${VERSION} -REVISION-main= 2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ libatomic_ops-${LIBAO_VERSION}${EXTRACT_SUFX} @@ -60,6 +59,5 @@ pre-build: post-install: @cd ${WRKBUILD}/libatomic_ops && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} install - ${INSTALL_DATA} ${WRKSRC}/doc/gc.man ${PREFIX}/man/man3/gc.3 .include <bsd.port.mk> diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo index f63a193b6b6..f0c7ec9d5c3 100644 --- a/devel/boehm-gc/distinfo +++ b/devel/boehm-gc/distinfo @@ -1,4 +1,4 @@ -SHA256 (gc-7.6.0.tar.gz) = oUoosRKb6Q5VzW9xEn/8VZThCR1dVBMVKMJM0MA7fZA= -SHA256 (libatomic_ops-7.6.6.tar.gz) = mf6rxfVId/MU20+t6xCfCz4dGlSvtrSz37oecH444HQ= -SIZE (gc-7.6.0.tar.gz) = 1111751 -SIZE (libatomic_ops-7.6.6.tar.gz) = 498187 +SHA256 (gc-7.6.12.tar.gz) = bK+sDZNlwvhgT5MKq9RxFFrEarb3ceg15XmVlk6EUII= +SHA256 (libatomic_ops-7.6.10.tar.gz) = WH7fYIF/Vtrx4as4pLPHKbjoRv9ntPYqYVcYNwjwma8= +SIZE (gc-7.6.12.tar.gz) = 1144396 +SIZE (libatomic_ops-7.6.10.tar.gz) = 503734 diff --git a/devel/boehm-gc/patches/patch-bdw-gc_pc_in b/devel/boehm-gc/patches/patch-bdw-gc_pc_in index 130ead0e56e..c25ddd15f8f 100644 --- a/devel/boehm-gc/patches/patch-bdw-gc_pc_in +++ b/devel/boehm-gc/patches/patch-bdw-gc_pc_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-bdw-gc_pc_in,v 1.1 2009/12/09 20:36:49 sthen Exp $ ---- bdw-gc.pc.in.orig Mon Dec 7 10:57:34 2009 -+++ bdw-gc.pc.in Mon Dec 7 10:57:46 2009 +$OpenBSD: patch-bdw-gc_pc_in,v 1.2 2019/05/14 00:05:00 ivmai Exp $ +--- bdw-gc.pc.in.orig Tue May 14 00:01:00 2019 ++++ bdw-gc.pc.in Tue Dec 14 00:04:00 2019 @@ -6,5 +6,5 @@ includedir=@includedir@ Name: Boehm-Demers-Weiser Conservative Garbage Collector Description: A garbage collector for C and C++ Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lgc -+Libs: -L${libdir} -lgc -pthread +-Libs: -L${libdir} @ATOMIC_OPS_LIBS@ -lgc ++Libs: -L${libdir} @ATOMIC_OPS_LIBS@ -lgc -pthread Cflags: -I${includedir} diff --git a/devel/boehm-gc/patches/patch-include_gc_config_macros_h b/devel/boehm-gc/patches/patch-include_gc_config_macros_h index eedafa84bae..4c6ababf8c4 100644 --- a/devel/boehm-gc/patches/patch-include_gc_config_macros_h +++ b/devel/boehm-gc/patches/patch-include_gc_config_macros_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-include_gc_config_macros_h,v 1.3 2014/02/09 06:01:54 shadchin Exp $ ---- include/gc_config_macros.h.orig Sat Jan 18 23:56:01 2014 -+++ include/gc_config_macros.h Sat Jan 18 23:54:59 2014 -@@ -87,14 +87,14 @@ +$OpenBSD: patch-include_gc_config_macros_h,v 1.4 2019/05/14 00:45:00 ivmai Exp $ +--- include/gc_config_macros.h.orig Tue May 14 00:01:00 2019 ++++ include/gc_config_macros.h Tue Dec 14 00:44:00 2019 +@@ -88,7 +88,9 @@ # if defined(__mips) && !defined(__linux__) # define GC_IRIX_THREADS # endif @@ -9,11 +9,13 @@ $OpenBSD: patch-include_gc_config_macros_h,v 1.3 2014/02/09 06:01:54 shadchin Ex +# if defined(__OpenBSD__) +# define GC_OPENBSD_THREADS +# elif defined(__sparc) && !defined(__linux__) \ - || defined(sun) && (defined(i386) || defined(__i386__) \ - || defined(__amd64__)) - # define GC_SOLARIS_THREADS - # elif defined(__APPLE__) && defined(__MACH__) + || ((defined(sun) || defined(__sun)) \ + && (defined(i386) || defined(__i386__) \ + || defined(__amd64) || defined(__amd64__))) +@@ -97,8 +99,6 @@ # define GC_DARWIN_THREADS + # elif defined(__HAIKU__) + # define GC_HAIKU_THREADS -# elif defined(__OpenBSD__) -# define GC_OPENBSD_THREADS # elif !defined(GC_LINUX_THREADS) && !defined(GC_HPUX_THREADS) \ diff --git a/devel/boehm-gc/patches/patch-include_private_gcconfig_h b/devel/boehm-gc/patches/patch-include_private_gcconfig_h index 6685f169c74..a085aefa2a2 100644 --- a/devel/boehm-gc/patches/patch-include_private_gcconfig_h +++ b/devel/boehm-gc/patches/patch-include_private_gcconfig_h @@ -1,22 +1,21 @@ -$OpenBSD: patch-include_private_gcconfig_h,v 1.22 2017/04/15 14:02:46 naddy Exp $ +$OpenBSD: patch-include_private_gcconfig_h,v 1.23 2019/05/14 10:42:00 ivmai Exp $ - All OpenBSD mips platforms are 64-bit, so correct the wordsize and alignment - use __data_start instead of _fdata on OpenBSD/mips64 - add support for OpenBSD/aarch64 ---- include/private/gcconfig.h.orig Tue Aug 2 21:36:14 2016 -+++ include/private/gcconfig.h Fri Apr 14 17:44:40 2017 -@@ -102,7 +102,8 @@ - # endif +--- include/private/gcconfig.h.orig Tue May 14 00:01:00 2019 ++++ include/private/gcconfig.h Tue May 14 10:40:00 2019 +@@ -115,7 +115,7 @@ # if defined(__aarch64__) # define AARCH64 --# if !defined(LINUX) && !defined(DARWIN) && !defined(FREEBSD) -+# if !defined(LINUX) && !defined(DARWIN) && !defined(FREEBSD) \ -+ && !defined(OPENBSD) + # if !defined(LINUX) && !defined(DARWIN) && !defined(FREEBSD) \ +- && !defined(NETBSD) ++ && !defined(NETBSD) && !defined(OPENBSD) # define NOSYS # define mach_type_known # endif -@@ -137,6 +138,10 @@ +@@ -150,6 +150,10 @@ # define ARM32 # define mach_type_known # endif @@ -27,30 +26,31 @@ $OpenBSD: patch-include_private_gcconfig_h,v 1.22 2017/04/15 14:02:46 naddy Exp # if defined(OPENBSD) && defined(__sh__) # define SH # define mach_type_known -@@ -1712,14 +1717,15 @@ +@@ -1742,7 +1746,8 @@ # endif # ifdef OPENBSD - # define OS_TYPE "OPENBSD" --# define ALIGNMENT 4 -+# define CPP_WORDSZ 64 -+# define ALIGNMENT 8 + # define OS_TYPE "OPENBSD" +-# define ALIGNMENT 4 ++# define CPP_WORDSZ 64 ++# define ALIGNMENT 8 # ifndef GC_OPENBSD_THREADS - # include <sys/param.h> - # include <uvm/uvm_extern.h> - # define STACKBOTTOM ((ptr_t)USRSTACK) - # endif -- extern int _fdata[]; --# define DATASTART ((ptr_t)_fdata) -+ extern int __data_start[]; -+# define DATASTART ((ptr_t)__data_start) - extern int _end[]; - # define DATAEND ((ptr_t)(&_end)) - # define DYNAMIC_LOADING -@@ -2165,6 +2171,19 @@ - extern char etext[]; - # define DATASTART GC_FreeBSDGetDataStart(0x1000, (ptr_t)etext) - # define DATASTART_USES_BSDGETDATASTART -+# endif + # include <sys/param.h> + # include <uvm/uvm_extern.h> +@@ -1752,8 +1757,8 @@ + # define HEURISTIC2 + # endif + # endif +- extern int _fdata[]; +-# define DATASTART ((ptr_t)_fdata) ++ extern int __data_start[]; ++# define DATASTART ((ptr_t)__data_start) + extern int _end[]; + # define DATAEND ((ptr_t)(&_end)) + # define DYNAMIC_LOADING +@@ -2221,6 +2226,19 @@ + # define ELF_CLASS ELFCLASS64 + # define DYNAMIC_LOADING + # endif +# ifdef OPENBSD +# define OS_TYPE "OPENBSD" +# ifndef GC_OPENBSD_THREADS @@ -63,6 +63,7 @@ $OpenBSD: patch-include_private_gcconfig_h,v 1.22 2017/04/15 14:02:46 naddy Exp + extern int _end[]; +# define DATAEND ((ptr_t)(&_end)) +# define DYNAMIC_LOADING - # endif ++# endif # ifdef NOSYS /* __data_start is usually defined in the target linker script. */ + extern int __data_start[]; diff --git a/devel/boehm-gc/pkg/DESCR-atomic b/devel/boehm-gc/pkg/DESCR-atomic index 10792aaa919..07f22b37c47 100644 --- a/devel/boehm-gc/pkg/DESCR-atomic +++ b/devel/boehm-gc/pkg/DESCR-atomic @@ -1,9 +1,11 @@ -This package provides semi-portable access to hardware provided -atomic memory operations. These might allow you to write code: +This package provides semi-portable access to hardware-provided +atomic memory update operations on a number of architectures. These might +allow you to write code: - That does more interesting things in signal handlers. - Makes more effective use of multiprocessors by allowing you to write clever lock-free code. Note that such code is very difficult to get right, and will unavoidably be less portable than lock-based code. It - ia also not always faster than lock-based code. But it may occasionally + is also not always faster than lock-based code. But it may occasionally be a large performance win. +- To experiment with new and much better thread programming paradigms, etc. diff --git a/devel/boehm-gc/pkg/DESCR-main b/devel/boehm-gc/pkg/DESCR-main index 02b7e57a3d3..52670568bef 100644 --- a/devel/boehm-gc/pkg/DESCR-main +++ b/devel/boehm-gc/pkg/DESCR-main @@ -1,4 +1,4 @@ -The Boehm-Weiser garbage collection package, for C and C++ - +The Boehm-Demers-Weiser garbage collection package, for C and C++ - garbage collection and memory leak detection libraries. A garbage collector is something which automatically frees malloc'd -- 2.17.0
