From 6a83163a611648f3ff2db42ffa472856f27ecdc5 Mon Sep 17 00:00:00 2001 From: EWouters <6179932+EWouters@users.noreply.github.com> Date: Sat, 2 Sep 2023 15:41:50 +0200 Subject: [PATCH] Ports/bdwgc: Update bdwgc to version 8.2.4 --- Ports/AvailablePorts.md | 2 +- Ports/bdwgc/package.sh | 4 ++-- .../patches/0003-Teach-dyn_load.c-about-serenity.patch | 4 ++-- .../0005-Make-the-collector-build-with-threads.patch | 9 +++++---- ...renity-to-the-configure-list-of-pthread-unixes.patch} | 6 +++--- Ports/bdwgc/patches/ReadMe.md | 6 ++++-- 6 files changed, 17 insertions(+), 14 deletions(-) rename Ports/bdwgc/patches/{0006-Add-serenity-to-the-conigure-list-of-pthread-unixes.patch => 0006-Add-serenity-to-the-configure-list-of-pthread-unixes.patch} (79%) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 50460aa724..7c402afb69 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -18,7 +18,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`bash`](bash/) | GNU Bash | 5.2.15 | https://www.gnu.org/software/bash/ | | [`bass`](bass/) | Beneath a Steel Sky | cd-1.2 | https://www.scummvm.org/games | | [`bc`](bc/) | bc | 6.5.0 | https://github.com/gavinhoward/bc | -| [`bdwgc`](bdwgc/) | Boehm-Demers-Weiser Garbage Collector (libgc) | 8.2.2 | https://github.com/ivmai/bdwgc | +| [`bdwgc`](bdwgc/) | Boehm-Demers-Weiser Garbage Collector (libgc) | 8.2.4 | https://github.com/ivmai/bdwgc | | [`binutils`](binutils/) | GNU Binutils | 2.41 | https://www.gnu.org/software/binutils/ | | [`bison`](bison/) | GNU Bison | 3.8 | https://www.gnu.org/software/bison/ | | [`bochs`](bochs/) | Bochs x86 PC emulator | 2.7 | https://sourceforge.net/projects/bochs/ | diff --git a/Ports/bdwgc/package.sh b/Ports/bdwgc/package.sh index dafda53a29..90c5c75ec0 100755 --- a/Ports/bdwgc/package.sh +++ b/Ports/bdwgc/package.sh @@ -1,9 +1,9 @@ #!/usr/bin/env -S bash ../.port_include.sh port='bdwgc' -version='8.2.2' +version='8.2.4' use_fresh_config_sub='true' files=( - "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz#f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0" + "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz#3d0d3cdbe077403d3106bb40f0cbb563413d6efdbb2a7e1cd6886595dec48fc2" ) depends=( 'libatomic_ops' diff --git a/Ports/bdwgc/patches/0003-Teach-dyn_load.c-about-serenity.patch b/Ports/bdwgc/patches/0003-Teach-dyn_load.c-about-serenity.patch index 4c75870941..58fbf96538 100644 --- a/Ports/bdwgc/patches/0003-Teach-dyn_load.c-about-serenity.patch +++ b/Ports/bdwgc/patches/0003-Teach-dyn_load.c-about-serenity.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Teach dyn_load.c about serenity 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dyn_load.c b/dyn_load.c -index 46c53af..9026932 100644 +index bee040c39925679ae159a644ec9b72d1fa794d25..db57ded046676d96f24ff948f0a8df2db4b4c847 100644 --- a/dyn_load.c +++ b/dyn_load.c @@ -63,7 +63,7 @@ STATIC GC_has_static_roots_func GC_has_static_roots = 0; @@ -54,7 +54,7 @@ index 46c53af..9026932 100644 /* If you don't need the "dynamic loading" feature, you may build */ /* the collector with -D IGNORE_DYNAMIC_LOADING. */ @@ -261,7 +278,7 @@ GC_INNER void GC_register_dynamic_libraries(void) - # endif /* !USE_PROC ... */ + # endif /* !USE_PROC_FOR_LIBRARIES */ # endif /* SOLARISDL */ -#if defined(SCO_ELF) || defined(DGUX) || defined(HURD) || defined(NACL) \ diff --git a/Ports/bdwgc/patches/0005-Make-the-collector-build-with-threads.patch b/Ports/bdwgc/patches/0005-Make-the-collector-build-with-threads.patch index 03dc9aa3ba..3d6d97c7e4 100644 --- a/Ports/bdwgc/patches/0005-Make-the-collector-build-with-threads.patch +++ b/Ports/bdwgc/patches/0005-Make-the-collector-build-with-threads.patch @@ -12,16 +12,17 @@ In an extremely limited way for now: make threads. - No fork handling Seems borked for unknown reasons. +Co-Authored-By: EWouters <6179932+EWouters@users.noreply.github.com> --- CMakeLists.txt | 6 +++++- tests/test.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 50dba74..6fcb550 100644 +index ddb04eece816e6c0440376210b514f964b66e3b1..c9e776d87d550f10505d89027a153d1cad575608 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -77,7 +77,11 @@ option(enable_register_main_static_data "Perform the initial guess of data root +@@ -86,7 +86,11 @@ option(enable_register_main_static_data "Perform the initial guess of data root option(enable_checksums "Report erroneously cleared dirty bits" OFF) option(enable_werror "Pass -Werror to the C compiler (treat warnings as errors)" OFF) option(enable_single_obj_compilation "Compile all libgc source files into single .o" OFF) @@ -32,10 +33,10 @@ index 50dba74..6fcb550 100644 + +OPTION(enable_handle_fork "Attempt to ensure a usable collector after fork()" OFF) option(disable_handle_fork "Prohibit installation of pthread_atfork() handlers" OFF) + option(enable_emscripten_asyncify "Use Emscripten asyncify feature" OFF) option(install_headers "Install header and pkg-config metadata files" ON) - option(without_libatomic_ops "Use atomic_ops.h in libatomic_ops/src" OFF) diff --git a/tests/test.c b/tests/test.c -index b41a300..0ad4ea5 100644 +index 8afc0fe7a1d2fdba644b9f762c6c34ee19bac4db..5d7d59e2e734da4fee44144edf9f33838a8ed0ed 100644 --- a/tests/test.c +++ b/tests/test.c @@ -43,7 +43,7 @@ diff --git a/Ports/bdwgc/patches/0006-Add-serenity-to-the-conigure-list-of-pthread-unixes.patch b/Ports/bdwgc/patches/0006-Add-serenity-to-the-configure-list-of-pthread-unixes.patch similarity index 79% rename from Ports/bdwgc/patches/0006-Add-serenity-to-the-conigure-list-of-pthread-unixes.patch rename to Ports/bdwgc/patches/0006-Add-serenity-to-the-configure-list-of-pthread-unixes.patch index e5e3ae3f87..c2d6d17e98 100644 --- a/Ports/bdwgc/patches/0006-Add-serenity-to-the-conigure-list-of-pthread-unixes.patch +++ b/Ports/bdwgc/patches/0006-Add-serenity-to-the-configure-list-of-pthread-unixes.patch @@ -1,17 +1,17 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Peter Elliott Date: Mon, 27 Mar 2023 20:18:18 +1100 -Subject: [PATCH] Add serenity to the conigure list of pthread unixes +Subject: [PATCH] Add serenity to the configure list of pthread unixes --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 7113d07..e51906c 100644 +index 0a62826167e403d794c517ec590dd3f2ff50a6da..f494dbe013b5ecc0a5b626a48f37b6d87cb0b0c0 100644 --- a/configure.ac +++ b/configure.ac -@@ -208,7 +208,7 @@ case "$THREADS" in +@@ -214,7 +214,7 @@ case "$THREADS" in *-*-aix* | *-*-android* | *-*-cygwin* | *-*-darwin* | *-*-dragonfly* | \ *-*-freebsd* | *-*-haiku* | *-*-hpux11* | *-*-irix* | \ *-*-kfreebsd*-gnu | *-*-gnu* | *-*-*linux* | *-*-msys* | *-*-nacl* | \ diff --git a/Ports/bdwgc/patches/ReadMe.md b/Ports/bdwgc/patches/ReadMe.md index 4422f06512..5ac59f4a94 100644 --- a/Ports/bdwgc/patches/ReadMe.md +++ b/Ports/bdwgc/patches/ReadMe.md @@ -36,6 +36,8 @@ In an extremely limited way for now: - No fork handling Seems borked for unknown reasons. -## `0006-Add-serenity-to-the-conigure-list-of-pthread-unixes.patch` +## `0006-Add-serenity-to-the-configure-list-of-pthread-unixes.patch` + +Add serenity to the configure list of pthread unixes + -Add serenity to the conigure list of pthread unixes