tools: zstd: add patch fixing wrong generated .pc with lib-mt

[openwrt/staging/stintel.git] / tools / zstd / Makefile

diff --git a/tools/zstd/Makefile b/tools/zstd/Makefile
index ea0f823e11da53fa2ea57ba8b9e197b4eec88113..728cef26b8fd4da0ee735e016f0b1ad13fac92a4 100644 (file)
--- a/tools/zstd/Makefile
+++ b/tools/zstd/Makefile
@@ -1,35 +1,45 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zstd
-PKG_VERSION:=1.5.4
+PKG_VERSION:=1.5.6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/facebook/zstd/releases/download/v$(PKG_VERSION)
-PKG_HASH:=0f470992aedad543126d06efab344dc5f3e171893810455787d38347343a4424
+PKG_HASH:=8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:facebook:zstandard
 
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/meson.mk
+HOST_BUILD_PARALLEL:=1
 
-MESON_HOST_BUILD_DIR:=$(HOST_BUILD_DIR)/build/meson/openwrt-build
+include $(INCLUDE_DIR)/host-build.mk
 
 HOSTCC:= $(HOSTCC_NOCACHE)
 
-MESON_HOST_ARGS += \
-       -Ddefault_library=static \
-       -Dlegacy_level=7 \
-       -Ddebug_level=0 \
-       -Dbacktrace=disabled \
-       -Dstatic_runtime=false \
-       -Dbin_programs=true \
-       -Dbin_tests=false \
-       -Dbin_contrib=false \
-       -Dmulti_thread=enabled \
-       -Dzlib=disabled \
-       -Dlzma=disabled \
-       -Dlz4=disabled
+HOST_CFLAGS += \
+       -DZSTDCLI_CLEVEL_MAX=20
+
+HOST_MAKE_FLAGS += \
+       BACKTRACE=0 \
+       HAVE_THREAD=1 \
+       HAVE_ZLIB=0 \
+       HAVE_LZMA=0 \
+       HAVE_LZ4=0 \
+       PREFIX=$(HOST_BUILD_PREFIX)
+
+define Host/Compile
+       $(call Host/Compile/Default,lib-mt)
+       $(call Host/Compile/Default,zstd)
+endef
+
+define Host/Install
+       +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/lib install-mt-pc install-static install-includes PREFIX=$(HOST_BUILD_PREFIX)
+       +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/programs install PREFIX=$(HOST_BUILD_PREFIX)
+endef
+
+define Host/Uninstall
+       -$(call Host/Compile/Default,uninstall)
+endef
 
 $(eval $(call HostBuild))