mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

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@gmail.com>
This commit is contained in:
Christian Marangi 2024-04-03 01:07:14 +02:00 committed by Robert Marko
parent 706f0e395f
commit 4b920e799f
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/Makefile
View File

@ -130,7 +130,6 @@ $(curdir)/sdcc/compile := $(curdir)/bison/compile
$(curdir)/squashfs3-lzma/compile := $(curdir)/lzma-old/compile $(curdir)/squashfs3-lzma/compile := $(curdir)/lzma-old/compile
$(curdir)/squashfs4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile $(curdir)/squashfs4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
$(curdir)/util-linux/compile := $(curdir)/bison/compile $(curdir)/util-linux/compile := $(curdir)/bison/compile
$(curdir)/zstd/compile := $(curdir)/meson/compile
ifneq ($(HOST_OS),Linux) ifneq ($(HOST_OS),Linux)
$(curdir)/coreutils/compile += $(curdir)/automake/compile $(curdir)/bison/compile $(curdir)/gnulib/compile $(curdir)/coreutils/compile += $(curdir)/automake/compile $(curdir)/bison/compile $(curdir)/gnulib/compile

40
tools/zstd/Makefile
View File

@ -11,25 +11,33 @@ PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:facebook:zstandard PKG_CPE_ID:=cpe:/a:facebook:zstandard
include $(INCLUDE_DIR)/host-build.mk HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/meson.mk
MESON_HOST_BUILD_DIR:=$(HOST_BUILD_DIR)/build/meson/openwrt-build include $(INCLUDE_DIR)/host-build.mk
HOSTCC:= $(HOSTCC_NOCACHE) HOSTCC:= $(HOSTCC_NOCACHE)
MESON_HOST_ARGS += \ HOST_MAKE_FLAGS += \
-Ddefault_library=static \ ZSTD_LEGACY_SUPPORT=7 \
-Dlegacy_level=7 \ BACKTRACE=0 \
-Ddebug_level=0 \ HAVE_THREAD=1 \
-Dbacktrace=disabled \ HAVE_ZLIB=0 \
-Dstatic_runtime=false \ HAVE_LZMA=0 \
-Dbin_programs=true \ HAVE_LZ4=0 \
-Dbin_tests=false \ PREFIX=$(HOST_BUILD_PREFIX)
-Dbin_contrib=false \
-Dmulti_thread=enabled \ define Host/Compile
-Dzlib=disabled \ $(call Host/Compile/Default,lib-mt)
-Dlzma=disabled \ $(call Host/Compile/Default,zstd)
-Dlz4=disabled 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)) $(eval $(call HostBuild))