From 84ddfa18805b09988d669afa5533868e7a81fa37 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Wed, 6 Oct 2021 08:03:12 +0300 Subject: [PATCH] boehm_gc: update to 8.0.6 (#6238) * Update license file * Remove patch for "mmap(PROT_NONE) failed" --- ..._gc-8.0.4.recipe => boehm_gc-8.0.6.recipe} | 9 ++++---- dev-libs/boehm_gc/licenses/Boehm | 2 +- .../boehm_gc/patches/boehm_gc-8.0.4.patchset | 22 ------------------- 3 files changed, 5 insertions(+), 28 deletions(-) rename dev-libs/boehm_gc/{boehm_gc-8.0.4.recipe => boehm_gc-8.0.6.recipe} (93%) delete mode 100644 dev-libs/boehm_gc/patches/boehm_gc-8.0.4.patchset diff --git a/dev-libs/boehm_gc/boehm_gc-8.0.4.recipe b/dev-libs/boehm_gc/boehm_gc-8.0.6.recipe similarity index 93% rename from dev-libs/boehm_gc/boehm_gc-8.0.4.recipe rename to dev-libs/boehm_gc/boehm_gc-8.0.6.recipe index fe0f02acd..89817555e 100644 --- a/dev-libs/boehm_gc/boehm_gc-8.0.4.recipe +++ b/dev-libs/boehm_gc/boehm_gc-8.0.6.recipe @@ -14,21 +14,20 @@ COPYRIGHT="1988, 1989 Hans-J. Boehm, Alan J. Demers 2001 Red Hat, Inc. 2004-2005 Andrei Polushin 2007 Free Software Foundation, Inc. - 2008-2018 Ivan Maidanski + 2008-2019 Ivan Maidanski 2011 Ludovic Courtes 2018 Petter A. Urkedal" LICENSE="Boehm" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/ivmai/bdwgc/releases/download/v$portVersion/gc-$portVersion.tar.gz" -CHECKSUM_SHA256="436a0ddc67b1ac0b0405b61a9675bca9e075c8156f4debd1d06f3a56c7cd289d" +CHECKSUM_SHA256="3b4914abc9fa76593596773e4da671d7ed4d5390e3d46fbf2e5f155e121bea11" SOURCE_DIR="gc-$portVersion" -PATCHES="boehm_gc-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" libcordVersion=1.4.0 -libgcVersion=1.4.3 +libgcVersion=1.4.4 libcordVersionCompat="$libcordVersion compat >= ${libcordVersion%%.*}" libgcVersionCompat="$libgcVersion compat >= ${libgcVersion%%.*}" portVersionCompat="$portVersion compat >= ${portVersion%%.*}" diff --git a/dev-libs/boehm_gc/licenses/Boehm b/dev-libs/boehm_gc/licenses/Boehm index 66391d21b..9e7a397bf 100644 --- a/dev-libs/boehm_gc/licenses/Boehm +++ b/dev-libs/boehm_gc/licenses/Boehm @@ -2,7 +2,7 @@ Copyright (c) 1988, 1989 Hans-J. Boehm, Alan J. Demers Copyright (c) 1991-1996 by Xerox Corporation. All rights reserved. Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved. Copyright (c) 1999-2011 Hewlett-Packard Development Company. -Copyright (c) 2008-2018 Ivan Maidanski +Copyright (c) 2008-2019 Ivan Maidanski The files pthread_stop_world.c, pthread_support.c and some others are also Copyright (c) 1998 by Fergus Henderson. All rights reserved. diff --git a/dev-libs/boehm_gc/patches/boehm_gc-8.0.4.patchset b/dev-libs/boehm_gc/patches/boehm_gc-8.0.4.patchset deleted file mode 100644 index a5d7fd018..000000000 --- a/dev-libs/boehm_gc/patches/boehm_gc-8.0.4.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From bbc09e8c410f0e2ff3e0b0c93884e87b5a75c15f Mon Sep 17 00:00:00 2001 -From: Massimiliano Gubinelli -Date: Mon, 23 Mar 2020 16:36:01 +0000 -Subject: fix for "mmap(PROT_NONE) failed" in compiling GNU Guile 2.2.7 - - -diff --git a/os_dep.c b/os_dep.c -index f0c3eae..03fb984 100644 ---- a/os_dep.c -+++ b/os_dep.c -@@ -2560,7 +2560,7 @@ GC_INNER void GC_unmap(ptr_t start, size_t bytes) - /* We immediately remap it to prevent an intervening mmap from */ - /* accidentally grabbing the same address space. */ - { --# ifdef CYGWIN32 -+# if defined(CYGWIN32) || defined(__HAIKU__) - /* Calling mmap() with the new protection flags on an */ - /* existing memory map with MAP_FIXED is broken on Cygwin. */ - /* However, calling mprotect() on the given address range */ --- -2.24.1 -