From 4db4d00c2007647625d99b8f2881d412a6e3454a Mon Sep 17 00:00:00 2001
From: Marius Gerbershagen <marius.gerbershagen@gmail.com>
Date: Sun, 13 Aug 2023 21:37:34 +0200
Subject: [PATCH] add workaround for broken bdwgc version 8.2.4

---
 src/aclocal.m4 | 4 ++++
 src/configure  | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 084ebbbbf..2e562c426 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -341,6 +341,7 @@ case "${host_os}" in
                 SHARED_LDFLAGS="-shared ${LDFLAGS}"
                 BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
                 ECL_LDRPATH="-Wl,--rpath,~A"
+		GC_CFLAGS="-DGC_PTHREAD_SIGMASK_NEEDED" dnl workaround for broken bdwgc v8.2.4
                 clibs="${clibs}"
                 SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
                 SONAME_LDFLAGS="-Wl,-soname,SONAME"
@@ -351,6 +352,7 @@ case "${host_os}" in
                 SHARED_LDFLAGS="-shared ${LDFLAGS}"
                 BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
                 ECL_LDRPATH="-Wl,--rpath,~A"
+		GC_CFLAGS="-DGC_PTHREAD_SIGMASK_NEEDED" dnl workaround for broken bdwgc v8.2.4
                 clibs="${clibs}"
                 SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
                 SONAME_LDFLAGS="-Wl,-soname,SONAME"
@@ -362,6 +364,7 @@ case "${host_os}" in
                 SHARED_LDFLAGS="-shared ${LDFLAGS}"
                 BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
                 ECL_LDRPATH="-Wl,--rpath,~A"
+		GC_CFLAGS="-DGC_PTHREAD_SIGMASK_NEEDED" dnl workaround for broken bdwgc v8.2.4
                 clibs="-lpthread ${clibs}"
                 SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
                 SONAME_LDFLAGS="-Wl,-soname,SONAME"
@@ -1132,6 +1135,7 @@ if test "${enable_boehm}" = "included"; then
     autoreconf -vif
     automake --add-missing
  fi;
+ CFLAGS="$CFLAGS $GC_CFLAGS";
  cd $currentdir;
  if mkdir gc; then
    if (destdir=`${PWDCMD}`; cd gc; \
diff --git a/src/configure b/src/configure
index b0322104b..4c63944c8 100755
--- a/src/configure
+++ b/src/configure
@@ -6042,6 +6042,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
                 SHARED_LDFLAGS="-shared ${LDFLAGS}"
                 BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
                 ECL_LDRPATH="-Wl,--rpath,~A"
+		GC_CFLAGS="-DGC_PTHREAD_SIGMASK_NEEDED"
                 clibs="${clibs}"
                 SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
                 SONAME_LDFLAGS="-Wl,-soname,SONAME"
@@ -6052,6 +6053,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
                 SHARED_LDFLAGS="-shared ${LDFLAGS}"
                 BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
                 ECL_LDRPATH="-Wl,--rpath,~A"
+		GC_CFLAGS="-DGC_PTHREAD_SIGMASK_NEEDED"
                 clibs="${clibs}"
                 SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
                 SONAME_LDFLAGS="-Wl,-soname,SONAME"
@@ -6063,6 +6065,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
                 SHARED_LDFLAGS="-shared ${LDFLAGS}"
                 BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
                 ECL_LDRPATH="-Wl,--rpath,~A"
+		GC_CFLAGS="-DGC_PTHREAD_SIGMASK_NEEDED"
                 clibs="-lpthread ${clibs}"
                 SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION"
                 SONAME_LDFLAGS="-Wl,-soname,SONAME"
@@ -7111,6 +7114,7 @@ printf "%s\n" "$as_me: Configuring included Boehm GC library:" >&6;}
     autoreconf -vif
     automake --add-missing
  fi;
+ CFLAGS="$CFLAGS $GC_CFLAGS";
  cd $currentdir;
  if mkdir gc; then
    if (destdir=`${PWDCMD}`; cd gc; \
@@ -12614,4 +12618,3 @@ fi
 
 
 for i in $srcdir/c/*/; do mkdir -p c/`basename $i`; done
-