Use system BDWGC 8.3.0 or later if possible

If BDWGC 8.3.0 or later exists, we use it directly.

Author: kou

.github/workflows/linux.yml

@@ -11,8 +11,15 @@ concurrency:
   group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}
   cancel-in-progress: true
 jobs:
-  setup:
-    name: Setup
+  libgcroots:
+    name: libgcroots
+    strategy:
+      fail-fast: false
+      matrix:
+        libgcroots:
+          - no
+          - installed
+          - tiny-subst
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
@@ -25,9 +32,35 @@ jobs:
       - name: Generate configure
         run: |
           ./autogen.sh
+      - name: "BDWGC: Checkout"
+        if: matrix.libgcroots == 'installed'
+        uses: actions/checkout@v6
+        with:
+          path: bdwgc
+          repository: bdwgc/bdwgc
+      - name: "BDWGC: Configure"
+        if: matrix.libgcroots == 'installed'
+        run: |
+          cmake \
+            -S bdwgc \
+            -B bdwgc.build \
+            -G Ninja \
+            -DCMAKE_INSTALL_PREFIX=/usr
+      - name: "BDWGC: Build"
+        if: matrix.libgcroots == 'installed'
+        run: |
+          cmake --build bdwgc.build
+      - name: "BDWGC: Install"
+        if: matrix.libgcroots == 'installed'
+        run: |
+          sudo cmake --install bdwgc.build
       - name: Configure
         run: |
-          ./configure --enable-maintainer-mode
+          ./configure \
+            --enable-conf=uim \
+            --enable-maintainer-mode \
+            --prefix=/usr \
+            --with-libgcroots=${{ matrix.libgcroots }}
       - name: Build
         run: |
           make -j$(nproc)

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "libgcroots"]
 	path = libgcroots
 	url = https://github.com/uim/libgcroots.git
-[submodule "bdwgc"]
-	path = bdwgc
-	url = https://github.com/bdwgc/bdwgc.git

Makefile.am

@@ -1,9 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = doc m4 tools
-if USE_BDWGC_BUNDLED
-SUBDIRS += bdwgc
-endif
 if USE_LIBGCROOTS_BUNDLED
 SUBDIRS += libgcroots
 endif

autogen.sh

@@ -3,7 +3,5 @@
 set -eu
 
 ${AUTORECONF:-autoreconf} --force --install "$@"
-cd bdwgc
-./autogen.sh
-cd ../libgcroots
+cd libgcroots
 ./autogen.sh "$@"

bdwgc

@@ -7,9 +7,6 @@ set -x
 rm -rf ~/source
 cp -a /source ~/source
 pushd ~/source
-pushd bdwgc
-./autogen.sh
-popd
 pushd libgcroots
 ./autogen.sh
 popd

ci/release.sh

@@ -267,10 +267,10 @@ AM_CONDITIONAL(WITH_MASTER_PKG, [test "x$with_master_pkg" != xno])
 
 AC_ARG_WITH(libgcroots,
             AS_HELP_STRING([--with-libgcroots@<:@=WHICH@:>@],
-                           [use alternative libgcroots instead of
-                            package-bundled one.
-                            WHICH=(installed|tiny-subst)
-                            @<:@default=installed@:>@]))
+                           [use system BDWGC or alternative libgcroots
+                            instead of package-bundled libgcroots.
+                            WHICH=(no|installed|tiny-subst)
+                            @<:@default=no@:>@]))
 
 case "${with_libgcroots:=no}" in
   no)
@@ -287,46 +287,38 @@ case "${with_libgcroots:=no}" in
     GCROOTS_REQ=gcroots
   ;;
   yes|installed)
-    PKG_CHECK_MODULES(GCROOTS, [gcroots >= 0.2.3],
-                      [],
-                      [AC_MSG_ERROR([installed libgcroots is not found.])])
-    use_libgcroots="installed one"
-    GCROOTS_REQ=gcroots
+    PKG_CHECK_MODULES(
+      BDWGC, [bdw-gc >= 8.3.0],
+      [BDWGC_REQ=bdw-gc
+       AC_DEFINE(SCM_WITH_BDWGC, 1, [Define to 1 to use BDWGC.])
+       use_libgcroots="installed BDWGC"],
+      [PKG_CHECK_MODULES(
+        GCROOTS, [gcroots >= 0.2.3],
+        [GCROOTS_REQ=gcroots
+         use_libgcroots="installed one"],
+        [AC_MSG_ERROR([neither BDWGC nor libgcroots was found.])])])
   ;;
   tiny-subst)
     # use src/gcroots/gcroots.[hc]
     with_libgcroots=tiny_subst
     GCROOTS_CFLAGS='-I$(sscm_abs_top_srcdir)/src/gcroots'
     use_libgcroots="tiny substitution in src/gcroots"
   ;;
-  bundled-bdwgc)
-    # use src/gcroots/gcroots.[hc] but redirecting to bundled bdwgc
-    with_libgcroots=tiny_subst_bdwgc
-    GCROOTS_CFLAGS='-I$(sscm_abs_top_srcdir)/src/gcroots -I$(sscm_abs_top_srcdir)/bdwgc/include'
-    AC_DEFINE(SCM_WITH_BDWGC, 1, [Define to 1 to use bdwgc library.])
-    use_libgcroots="based on bundled bdwgc"
-
-    ac_configure_args="$ac_configure_args --disable-threads"
-    AC_CONFIG_SUBDIRS([bdwgc])
-    GCROOTS_LIBS='$(sscm_abs_top_builddir)/bdwgc/libgc.la'
-  ;;
   *)
     AC_MSG_ERROR([invalid argument for --with-libgcroots.])
   ;;
 esac
 
+AC_SUBST(BDWGC_REQ)
+AC_SUBST(BDWGC_LIBS)
+AC_SUBST(BDWGC_CFLAGS)
 AC_SUBST(GCROOTS_REQ)
 AC_SUBST(GCROOTS_LIBS)
 AC_SUBST(GCROOTS_CFLAGS)
-AM_CONDITIONAL(USE_BDWGC_BUNDLED,
-               [test "x$with_libgcroots" = xtiny_subst_bdwgc])
-AM_CONDITIONAL(USE_LIBGCROOTS,
-               [test "x$with_libgcroots" != xtiny_subst \
-                    -a "x$with_libgcroots" != xtiny_subst_bdwgc])
+AM_CONDITIONAL(USE_LIBGCROOTS, [test "x$with_libgcroots" != xtiny_subst])
 AM_CONDITIONAL(USE_LIBGCROOTS_BUNDLED, [test "x$with_libgcroots" = xno])
 AM_CONDITIONAL(USE_LIBGCROOTS_TINY_SUBST,
-               [test "x$with_libgcroots" = xtiny_subst \
-                    -o "x$with_libgcroots" = xtiny_subst_bdwgc])
+               [test "x$with_libgcroots" = xtiny_subst])
 
 
 ########################################

configure.ac

@@ -67,6 +67,6 @@ sscm_debug=@use_debug@
 Name: @PACKAGE_NAME@
 Description: Scheme interpreter for embedded use
 Version: @VERSION@
-Requires: @GCROOTS_REQ@
+Requires.private: @BDWGC_REQ@ @GCROOTS_REQ@
 Libs: -L${libdir} -lsscm
 Cflags: -I${includedir}

sigscheme.pc.in

@@ -369,20 +369,20 @@ endif
 
 if USE_LIBSSCM
 libsscm_la_SOURCES  = $(libsscm_sources)
-libsscm_la_LIBADD   = $(LIBOBJS) @GCROOTS_LIBS@
+libsscm_la_LIBADD   = $(LIBOBJS) @BDWGC_LIBS@ @GCROOTS_LIBS@
 libsscm_la_LDFLAGS  = -version-info $(libsscm_version)
 # To take precedence over installed gcroots.h by the bundled
 # libgcroots/include/gcroots.h, @GCROOTS_CFLAGS@ must be placed here.
-libsscm_la_CPPFLAGS = -I$(top_builddir)/include @GCROOTS_CFLAGS@ \
-                      -DSCM_COMPILING_LIBSSCM=1
+libsscm_la_CPPFLAGS = -I$(top_builddir)/include @BDWGC_CFLAGS@ \
+                      @GCROOTS_CFLAGS@ -DSCM_COMPILING_LIBSSCM=1
 libsscm_la_CFLAGS   =
 endif
 
 if USE_SHELL
 bin_PROGRAMS  = sscm
 sscm_SOURCES  = main.c
-sscm_LDADD    = libsscm.la @GCROOTS_LIBS@
-sscm_CPPFLAGS = -I$(top_builddir)/include @GCROOTS_CFLAGS@
+sscm_LDADD    = libsscm.la @BDWGC_LIBS@ @GCROOTS_LIBS@
+sscm_CPPFLAGS = -I$(top_builddir)/include @BDWGC_CFLAGS@ @GCROOTS_CFLAGS@
 sscm_CFLAGS   =
 endif