summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/zstd
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-15 06:20:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-18 12:43:00 +0100
commit9ca6a18e04b3b11c85e328fd2c101b7cb8b2d406 (patch)
tree768d80ea805e0afb11a226f7687be446e56c8e8d /meta/recipes-extended/zstd
parentc4dacef328c73c2c3707f3af4151f382e80bd98a (diff)
downloadpoky-9ca6a18e04b3b11c85e328fd2c101b7cb8b2d406.tar.gz
zstd: upgrade 1.4.9 -> 1.5.0
(From OE-Core rev: 6de028400650c1a8f6320c46d3b191bccdfad331) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/zstd')
-rw-r--r--meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch16
-rw-r--r--meta/recipes-extended/zstd/zstd_1.5.0.bb (renamed from meta/recipes-extended/zstd/zstd_1.4.9.bb)2
2 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch b/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
index b5ffb95b71..37c5ff0cc0 100644
--- a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
+++ b/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch
@@ -1,4 +1,4 @@
1From 986c7917aef632745cb3388a86a2f62347d5a0a5 Mon Sep 17 00:00:00 2001 1From 77c7963c7a0f1c455f20520d5c7b1ec9b17a44fb Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 23 Dec 2020 19:14:32 +0100 3Date: Wed, 23 Dec 2020 19:14:32 +0100
4Subject: [PATCH] Makefile: sort all wildcard file list expansions 4Subject: [PATCH] Makefile: sort all wildcard file list expansions
@@ -16,7 +16,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
16 3 files changed, 8 insertions(+), 8 deletions(-) 16 3 files changed, 8 insertions(+), 8 deletions(-)
17 17
18diff --git a/programs/Makefile b/programs/Makefile 18diff --git a/programs/Makefile b/programs/Makefile
19index 936f3c80..b8200fae 100644 19index 599fb02f..2c416467 100644
20--- a/programs/Makefile 20--- a/programs/Makefile
21+++ b/programs/Makefile 21+++ b/programs/Makefile
22@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy 22@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy
@@ -45,11 +45,11 @@ index 936f3c80..b8200fae 100644
45 45
46 ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC) 46 ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC)
47diff --git a/tests/Makefile b/tests/Makefile 47diff --git a/tests/Makefile b/tests/Makefile
48index f0605057..74a90b0f 100644 48index 85553007..b71cdba8 100644
49--- a/tests/Makefile 49--- a/tests/Makefile
50+++ b/tests/Makefile 50+++ b/tests/Makefile
51@@ -49,7 +49,7 @@ ZSTD_FILES := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES) 51@@ -49,7 +49,7 @@ ZSTDDECOMP_FILES := $(ZSTDDIR)/decompress/*.c
52 ZBUFF_FILES := $(ZSTDDIR)/deprecated/*.c 52 ZSTD_FILES := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES)
53 ZDICT_FILES := $(ZSTDDIR)/dictBuilder/*.c 53 ZDICT_FILES := $(ZSTDDIR)/dictBuilder/*.c
54 54
55-ZSTD_F1 := $(wildcard $(ZSTD_FILES)) 55-ZSTD_F1 := $(wildcard $(ZSTD_FILES))
@@ -57,7 +57,7 @@ index f0605057..74a90b0f 100644
57 ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1)) 57 ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1))
58 ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1)) 58 ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1))
59 ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2)) 59 ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2))
60@@ -211,7 +211,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c bigdict.c 60@@ -202,7 +202,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c bigdict.c
61 invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c 61 invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c
62 62
63 legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4 63 legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4
@@ -67,10 +67,10 @@ index f0605057..74a90b0f 100644
67 decodecorpus : LDLIBS += -lm 67 decodecorpus : LDLIBS += -lm
68 decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS)) $(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c 68 decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS)) $(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c
69diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile 69diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile
70index f3a561de..68a29ef0 100644 70index ccb574b7..b1cb2935 100644
71--- a/tests/fuzz/Makefile 71--- a/tests/fuzz/Makefile
72+++ b/tests/fuzz/Makefile 72+++ b/tests/fuzz/Makefile
73@@ -58,7 +58,7 @@ FUZZ_SRC := \ 73@@ -62,7 +62,7 @@ FUZZ_SRC := \
74 $(ZSTDCOMP_SRC) \ 74 $(ZSTDCOMP_SRC) \
75 $(ZSTDDICT_SRC) \ 75 $(ZSTDDICT_SRC) \
76 $(ZSTDLEGACY_SRC) 76 $(ZSTDLEGACY_SRC)
diff --git a/meta/recipes-extended/zstd/zstd_1.4.9.bb b/meta/recipes-extended/zstd/zstd_1.5.0.bb
index b86fdf8b2d..9c95020743 100644
--- a/meta/recipes-extended/zstd/zstd_1.4.9.bb
+++ b/meta/recipes-extended/zstd/zstd_1.5.0.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/facebook/zstd.git;branch=release \
13 file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \ 13 file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \
14 " 14 "
15 15
16SRCREV = "e4558ffd1dc49399faf4ee5d85abed4386b4dcf5" 16SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6"
17UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" 17UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
18 18
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"