summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch19
-rw-r--r--meta/recipes-extended/zstd/zstd_1.4.9.bb (renamed from meta/recipes-extended/zstd/zstd_1.4.8.bb)2
2 files changed, 11 insertions, 10 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 178124a2ef..b5ffb95b71 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 8d01b0753162681dcdbb7cf56f1e393c261e3eb0 Mon Sep 17 00:00:00 2001 1From 986c7917aef632745cb3388a86a2f62347d5a0a5 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
@@ -8,6 +8,7 @@ reproducible builds.
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
11--- 12---
12 programs/Makefile | 10 +++++----- 13 programs/Makefile | 10 +++++-----
13 tests/Makefile | 4 ++-- 14 tests/Makefile | 4 ++--
@@ -15,10 +16,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
15 3 files changed, 8 insertions(+), 8 deletions(-) 16 3 files changed, 8 insertions(+), 8 deletions(-)
16 17
17diff --git a/programs/Makefile b/programs/Makefile 18diff --git a/programs/Makefile b/programs/Makefile
18index 8641d0ee..26fee45f 100644 19index 936f3c80..b8200fae 100644
19--- a/programs/Makefile 20--- a/programs/Makefile
20+++ b/programs/Makefile 21+++ b/programs/Makefile
21@@ -72,11 +72,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy 22@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy
22 23
23 vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS) $(ZDICT_DIR) $(ZSTDLEGACY_DIR) 24 vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS) $(ZDICT_DIR) $(ZSTDLEGACY_DIR)
24 25
@@ -34,17 +35,17 @@ index 8641d0ee..26fee45f 100644
34 35
35 ZSTD_LEGACY_SUPPORT ?= 5 36 ZSTD_LEGACY_SUPPORT ?= 5
36 ZSTDLEGACY_SRC := 37 ZSTDLEGACY_SRC :=
37@@ -91,7 +91,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) $(ZSTDLEGACY_SRC) $(ZDICT_SRC)) 38@@ -93,7 +93,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) $(ZSTDLEGACY_SRC) $(ZDICT_SRC))
38 ZSTDLIB_LOCAL_SRC := $(notdir $(ZSTDLIB_FULL_SRC)) 39 ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC))
39 ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o) 40 ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o)
40 41
41-ZSTD_CLI_SRC := $(wildcard *.c) 42-ZSTD_CLI_SRC := $(wildcard *.c)
42+ZSTD_CLI_SRC := $(sort $(wildcard *.c)) 43+ZSTD_CLI_SRC := $(sort $(wildcard *.c))
43 ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o) 44 ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o)
44 45
45 ZSTD_ALL_SRC := $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC) 46 ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC)
46diff --git a/tests/Makefile b/tests/Makefile 47diff --git a/tests/Makefile b/tests/Makefile
47index 42bc353c..5f5654f0 100644 48index f0605057..74a90b0f 100644
48--- a/tests/Makefile 49--- a/tests/Makefile
49+++ b/tests/Makefile 50+++ b/tests/Makefile
50@@ -49,7 +49,7 @@ ZSTD_FILES := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES) 51@@ -49,7 +49,7 @@ ZSTD_FILES := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES)
@@ -56,7 +57,7 @@ index 42bc353c..5f5654f0 100644
56 ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1)) 57 ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1))
57 ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1)) 58 ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1))
58 ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2)) 59 ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2))
59@@ -212,7 +212,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c bigdict.c 60@@ -211,7 +211,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c bigdict.c
60 invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c 61 invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c
61 62
62 legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4 63 legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4
@@ -66,7 +67,7 @@ index 42bc353c..5f5654f0 100644
66 decodecorpus : LDLIBS += -lm 67 decodecorpus : LDLIBS += -lm
67 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
68diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile 69diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile
69index 36232a8c..574fe877 100644 70index f3a561de..68a29ef0 100644
70--- a/tests/fuzz/Makefile 71--- a/tests/fuzz/Makefile
71+++ b/tests/fuzz/Makefile 72+++ b/tests/fuzz/Makefile
72@@ -58,7 +58,7 @@ FUZZ_SRC := \ 73@@ -58,7 +58,7 @@ FUZZ_SRC := \
diff --git a/meta/recipes-extended/zstd/zstd_1.4.8.bb b/meta/recipes-extended/zstd/zstd_1.4.9.bb
index 10a6334cb7..b86fdf8b2d 100644
--- a/meta/recipes-extended/zstd/zstd_1.4.8.bb
+++ b/meta/recipes-extended/zstd/zstd_1.4.9.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 = "97a3da1df009d4dc67251de0c4b1c9d7fe286fc1" 16SRCREV = "e4558ffd1dc49399faf4ee5d85abed4386b4dcf5"
17UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" 17UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
18 18
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"