mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 12:32:12 +02:00
zstd: upgrade 1.4.9 -> 1.5.0
(From OE-Core rev: 6de028400650c1a8f6320c46d3b191bccdfad331) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 986c7917aef632745cb3388a86a2f62347d5a0a5 Mon Sep 17 00:00:00 2001
|
||||
From 77c7963c7a0f1c455f20520d5c7b1ec9b17a44fb Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 23 Dec 2020 19:14:32 +0100
|
||||
Subject: [PATCH] Makefile: sort all wildcard file list expansions
|
||||
@@ -16,7 +16,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
3 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/programs/Makefile b/programs/Makefile
|
||||
index 936f3c80..b8200fae 100644
|
||||
index 599fb02f..2c416467 100644
|
||||
--- a/programs/Makefile
|
||||
+++ b/programs/Makefile
|
||||
@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy
|
||||
@@ -45,11 +45,11 @@ index 936f3c80..b8200fae 100644
|
||||
|
||||
ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC)
|
||||
diff --git a/tests/Makefile b/tests/Makefile
|
||||
index f0605057..74a90b0f 100644
|
||||
index 85553007..b71cdba8 100644
|
||||
--- a/tests/Makefile
|
||||
+++ b/tests/Makefile
|
||||
@@ -49,7 +49,7 @@ ZSTD_FILES := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES)
|
||||
ZBUFF_FILES := $(ZSTDDIR)/deprecated/*.c
|
||||
@@ -49,7 +49,7 @@ ZSTDDECOMP_FILES := $(ZSTDDIR)/decompress/*.c
|
||||
ZSTD_FILES := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES)
|
||||
ZDICT_FILES := $(ZSTDDIR)/dictBuilder/*.c
|
||||
|
||||
-ZSTD_F1 := $(wildcard $(ZSTD_FILES))
|
||||
@@ -57,7 +57,7 @@ index f0605057..74a90b0f 100644
|
||||
ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1))
|
||||
ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1))
|
||||
ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2))
|
||||
@@ -211,7 +211,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c bigdict.c
|
||||
@@ -202,7 +202,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c bigdict.c
|
||||
invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c
|
||||
|
||||
legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4
|
||||
@@ -67,10 +67,10 @@ index f0605057..74a90b0f 100644
|
||||
decodecorpus : LDLIBS += -lm
|
||||
decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS)) $(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c
|
||||
diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile
|
||||
index f3a561de..68a29ef0 100644
|
||||
index ccb574b7..b1cb2935 100644
|
||||
--- a/tests/fuzz/Makefile
|
||||
+++ b/tests/fuzz/Makefile
|
||||
@@ -58,7 +58,7 @@ FUZZ_SRC := \
|
||||
@@ -62,7 +62,7 @@ FUZZ_SRC := \
|
||||
$(ZSTDCOMP_SRC) \
|
||||
$(ZSTDDICT_SRC) \
|
||||
$(ZSTDLEGACY_SRC)
|
||||
|
||||
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/facebook/zstd.git;branch=release \
|
||||
file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \
|
||||
"
|
||||
|
||||
SRCREV = "e4558ffd1dc49399faf4ee5d85abed4386b4dcf5"
|
||||
SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
Reference in New Issue
Block a user