[openwrt/openwrt] tools: zstd: convert to make and drop meson dependency

LEDE Commits lede-commits at lists.infradead.org
Sat Apr 6 02:24:28 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/4b920e799fba445c450d9bc86843c0a37e202e7f

commit 4b920e799fba445c450d9bc86843c0a37e202e7f
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Wed Apr 3 01:07:14 2024 +0200

    tools: zstd: convert to make and drop meson dependency
    
    Convert to make and drop meson dependency since it's not a core tools
    and can't depend on advanced build system like cmake or meson.
    
    On top of this make is the official build support and cmake/meson are
    supported by 3rd parties.
    
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 tools/Makefile      |  1 -
 tools/zstd/Makefile | 40 ++++++++++++++++++++++++----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index 7607e84481..36a2ae1933 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -130,7 +130,6 @@ $(curdir)/sdcc/compile := $(curdir)/bison/compile
 $(curdir)/squashfs3-lzma/compile := $(curdir)/lzma-old/compile
 $(curdir)/squashfs4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
 $(curdir)/util-linux/compile := $(curdir)/bison/compile
-$(curdir)/zstd/compile := $(curdir)/meson/compile
 
 ifneq ($(HOST_OS),Linux)
   $(curdir)/coreutils/compile += $(curdir)/automake/compile $(curdir)/bison/compile $(curdir)/gnulib/compile
diff --git a/tools/zstd/Makefile b/tools/zstd/Makefile
index 41dd70b7a9..3f69c6d497 100644
--- a/tools/zstd/Makefile
+++ b/tools/zstd/Makefile
@@ -11,25 +11,33 @@ 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_MAKE_FLAGS += \
+	ZSTD_LEGACY_SUPPORT=7 \
+	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-pc install-static 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))




More information about the lede-commits mailing list