Skip to content

Commit

Permalink
Revert "tools/zstd: update to 1.5.2"
Browse files Browse the repository at this point in the history
This reverts commit 8de901c.

Apparently this update breaks tools building.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  • Loading branch information
jow- committed Feb 7, 2022
1 parent 3343ca7 commit af79853
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 21 deletions.
2 changes: 1 addition & 1 deletion tools/Makefile
Expand Up @@ -74,7 +74,7 @@ $(curdir)/sdcc/compile := $(curdir)/bison/compile
$(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
$(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
$(curdir)/zlib/compile := $(curdir)/cmake/compile
$(curdir)/zstd/compile := $(curdir)/meson/compile
$(curdir)/zstd/compile := $(curdir)/cmake/compile

ifneq ($(HOST_OS),Linux)
$(curdir)/squashfskit4/compile += $(curdir)/coreutils/compile
Expand Down
30 changes: 10 additions & 20 deletions tools/zstd/Makefile
@@ -1,35 +1,25 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=zstd
PKG_VERSION:=1.5.2
PKG_VERSION:=1.5.0

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/facebook/zstd/releases/download/v$(PKG_VERSION)
PKG_HASH:=7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0
PKG_HASH:=5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94

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

MESON_HOST_BUILD_DIR:=$(HOST_BUILD_DIR)/build/meson/openwrt-build
CMAKE_SOURCE_SUBDIR:=build/cmake

HOSTCC:= $(HOSTCC_NOCACHE)
HOST_LDFLAGS += -Wl,-rpath,$(STAGING_DIR_HOST)/lib
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk

MESON_HOST_ARGS += \
-Dlegacy_level=7 \
-Ddebug_level=0 \
-Dbacktrace=false \
-Dstatic_runtime=false \
-Dbin_programs=true \
-Dbin_tests=false \
-Dbin_contrib=false \
-Dmulti_thread=enabled \
-Dzlib=disabled \
-Dlzma=disabled \
-Dlz4=disabled
CMAKE_HOST_OPTIONS += \
-DBUILD_TESTING=OFF \
-DCMAKE_C_COMPILER_LAUNCHER="" \
-DCMAKE_C_COMPILER=$(HOSTCC_NOCACHE) \
-DZSTD_LEGACY_SUPPORT=OFF

$(eval $(call HostBuild))

0 comments on commit af79853

Please sign in to comment.