From 52154e52069d20105f62191e6c9f903f188a5129 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Fri, 4 Dec 2020 10:57:01 +0100 Subject: [PATCH] package/zstd: build multithreaded library if supported libzstd.so is built without multi-threading support by default. The 'HAVE_THREAD' flag is not respected by lib/Makefile, only by programs/Makefile. Use the %-mt recipe in lib/Makefile to enable multithreading. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/zstd/zstd.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index e26e67f46b..c3af9bd58c 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -48,6 +48,14 @@ ZSTD_BUILD_LIBS = libzstd.a libzstd ZSTD_INSTALL_LIBS = install-static install-shared endif +# The HAVE_THREAD flag is read by the 'programs' makefile but not by the 'lib' +# one. Building a multi-threaded binary with a library (which defaults to +# single-threaded) gives a runtime error when compressing files. +# The 'lib' makefile provides specific '%-mt' targets for this purpose. +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ZSTD_BUILD_LIBS := $(addsuffix -mt,$(ZSTD_BUILD_LIBS)) +endif + define ZSTD_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ -C $(@D)/lib $(ZSTD_BUILD_LIBS) -- 2.30.2