From: Fabrice Fontaine Date: Mon, 16 Aug 2021 21:51:46 +0000 (+0200) Subject: package/harfbuzz: fix build without threads X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6454eacf1018ec9be9d4f833e7a8f0a21a47f167;p=buildroot.git package/harfbuzz: fix build without threads Fix the following build failures without threads by defining HB_NO_MT as specified in https://github.com/harfbuzz/harfbuzz/blob/main/CONFIG.md: In file included from ../src/hb.hh:458, from ../src/hb-blob.cc:28: ../src/hb-mutex.hh:88:2: error: #error "Could not find any system to define mutex macros." 88 | #error "Could not find any system to define mutex macros." | ^~~~~ This build failure is raised since bump to version 2.8.1 in commit e9ba1c80e8ebf5f5ad9d889d2dd37f27af87e811 and https://github.com/harfbuzz/harfbuzz/commit/711c241f6c7e18c5403602375a733af74df76f83 which removed busyloop mutex implementation. Fixes: - http://autobuild.buildroot.org/results/0c03aca5e3ade735b54b0b9233896b868aec1520 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index f327a95eb6..c7f5dfe9d2 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -90,5 +90,9 @@ else HARFBUZZ_CONF_OPTS += -Dicu=disabled endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +HARFBUZZ_CXXFLAGS += $(TARGET_CXXFLAGS) -DHB_NO_MT +endif + $(eval $(meson-package)) $(eval $(host-meson-package))