From 7833101c8c8938d58a32e355b9af1b56e4229a87 Mon Sep 17 00:00:00 2001 From: Hugo Vasconcelos Saldanha Date: Thu, 20 Aug 2020 13:50:47 +0200 Subject: [PATCH 2/2] cacao: use system's boehm garbage collector This is a Gentoo's patch [1] to force the use of system's bdwgc. Cacao was installing an internal version of bdwgc which conflicts with the system's version. [1] https://gitweb.gentoo.org/proj/java.git/plain/dev-java/cacao/files/system-boehm-gc.patch Upstream-Status: Inappropriate [not author] Signed-off-by: Hugo Vasconcelos Saldanha Signed-off-by: Richard Leitner --- configure.ac | 8 ++------ src/mm/Makefile.am | 9 ++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index aceb2033b..db8a9770e 100644 --- a/configure.ac +++ b/configure.ac @@ -738,6 +738,8 @@ AC_CHECK_ENABLE_GCC_PR40134 AC_CHECK_ENABLE_PIC_ASM +PKG_CHECK_MODULES([BOEHM], bdw-gc,,AC_MSG_ERROR[boehm-gc not found]) + dnl Define version numbers. AC_VERSION_DETAIL AC_VERSION_CONFIG @@ -855,12 +857,6 @@ AC_CONFIG_FILES([Makefile] ) -dnl We only build the shared library objects but we use it as -dnl noinst_LTLIBRARIES. -ac_configure_args="$ac_configure_args --disable-static" -AC_CONFIG_SUBDIRS(src/mm/boehm-gc) - - AC_OUTPUT diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am index 9d0945a29..cbd7dc963 100644 --- a/src/mm/Makefile.am +++ b/src/mm/Makefile.am @@ -35,14 +35,13 @@ GC_FILE = \ endif if ENABLE_GC_BOEHM -SUBDIRS = \ - boehm-gc - GC_FILE = \ gc-boehm.cpp -GC_LIB = \ - $(top_builddir)/src/mm/boehm-gc/libgc.la +AM_CPPFLAGS += $(BOEHM_CFLAGS) + +GC_LIB = $(BOEHM_LIBS) + endif if ENABLE_GC_CACAO -- 2.28.0