| Message ID | 20220127102005.3050843-11-alex@linutronix.de |
|---|---|
| State | Accepted, archived |
| Commit | cfd76fb067e2390aa06ae6a9f9dd7cc8a8d57d09 |
| Headers | show |
| Series | [01/17] mesa: fold mesa-gl variant into the main recipe using mcextend class | expand |
quick look shows that size of zstd package reduces quite a bit, I wonder why -4720 KiB zstd +2932 KiB zstd small is ofcourse better, but I wonder what could reduce it so much between 1.5.0 and 1.5.2 On Thu, Jan 27, 2022 at 2:20 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > Drop patches merged upstream. > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > ...rt-all-wildcard-file-list-expansions.patch | 81 -------- > .../zstd/zstd/0001-MinGW-Build-Fixes.patch | 193 ------------------ > .../zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb} | 7 +- > 3 files changed, 2 insertions(+), 279 deletions(-) > delete mode 100644 meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch > delete mode 100644 meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch > rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb} (86%) > > 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 > deleted file mode 100644 > index 3d23648f5b..0000000000 > --- a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch > +++ /dev/null > @@ -1,81 +0,0 @@ > -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 > - > -Otherwise the order is non-deterministic and breaks > -reproducible builds. > - > -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2895] > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > - > ---- > - programs/Makefile | 10 +++++----- > - tests/Makefile | 4 ++-- > - tests/fuzz/Makefile | 2 +- > - 3 files changed, 8 insertions(+), 8 deletions(-) > - > -diff --git a/programs/Makefile b/programs/Makefile > -index 599fb02f..2c416467 100644 > ---- a/programs/Makefile > -+++ b/programs/Makefile > -@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy > - > - vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS) $(ZDICT_DIR) $(ZSTDLEGACY_DIR) > - > --ZSTDLIB_COMMON_C := $(wildcard $(ZSTDLIB_COMMON)/*.c) > --ZSTDLIB_COMPRESS_C := $(wildcard $(ZSTDLIB_COMPRESS)/*.c) > --ZSTDLIB_DECOMPRESS_C := $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c) > -+ZSTDLIB_COMMON_C := $(sort $(wildcard $(ZSTDLIB_COMMON)/*.c)) > -+ZSTDLIB_COMPRESS_C := $(sort $(wildcard $(ZSTDLIB_COMPRESS)/*.c)) > -+ZSTDLIB_DECOMPRESS_C := $(sort $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c)) > - ZSTDLIB_CORE_SRC := $(ZSTDLIB_DECOMPRESS_C) $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) > --ZDICT_SRC := $(wildcard $(ZDICT_DIR)/*.c) > -+ZDICT_SRC := $(sort $(wildcard $(ZDICT_DIR)/*.c)) > - > - ZSTD_LEGACY_SUPPORT ?= 5 > - ZSTDLEGACY_SRC := > -@@ -93,7 +93,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) $(ZSTDLEGACY_SRC) $(ZDICT_SRC)) > - ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC)) > - ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o) > - > --ZSTD_CLI_SRC := $(wildcard *.c) > -+ZSTD_CLI_SRC := $(sort $(wildcard *.c)) > - ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o) > - > - ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC) > -diff --git a/tests/Makefile b/tests/Makefile > -index 85553007..b71cdba8 100644 > ---- a/tests/Makefile > -+++ b/tests/Makefile > -@@ -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)) > -+ZSTD_F1 := $(sort $(wildcard $(ZSTD_FILES))) > - ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1)) > - ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1)) > - ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2)) > -@@ -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 > --legacy : $(ZSTD_FILES) $(wildcard $(ZSTDDIR)/legacy/*.c) legacy.c > -+legacy : $(ZSTD_FILES) $(sort $(wildcard $(ZSTDDIR)/legacy/*.c)) legacy.c > - > - 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 ccb574b7..b1cb2935 100644 > ---- a/tests/fuzz/Makefile > -+++ b/tests/fuzz/Makefile > -@@ -62,7 +62,7 @@ FUZZ_SRC := \ > - $(ZSTDCOMP_SRC) \ > - $(ZSTDDICT_SRC) \ > - $(ZSTDLEGACY_SRC) > --FUZZ_SRC := $(wildcard $(FUZZ_SRC)) > -+FUZZ_SRC := $(sort $(wildcard $(FUZZ_SRC))) > - > - FUZZ_D_OBJ1 := $(subst $(ZSTDDIR)/common/,d_lib_common_,$(FUZZ_SRC)) > - FUZZ_D_OBJ2 := $(subst $(ZSTDDIR)/compress/,d_lib_compress_,$(FUZZ_D_OBJ1)) > diff --git a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch > deleted file mode 100644 > index a0e00dca03..0000000000 > --- a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch > +++ /dev/null > @@ -1,193 +0,0 @@ > -From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001 > -From: Joshua Watt <JPEWhacker@gmail.com> > -Date: Wed, 26 May 2021 09:15:40 -0500 > -Subject: [PATCH] MinGW Build Fixes > - > -Fixes building on MinGW by > - 1) Exporting the OS variable so that it is visible to sub-make > - invocations > - 2) Fixing the extension handling so that make correctly identifies when > - targets need to be rebuilt. Without the correct handling, make would > - rebuild the executable targets when running `make install` because > - it couldn't find them with the correct extension. > - > -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2685] > -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> > ---- > - Makefile | 1 + > - programs/Makefile | 74 +++++++++++++++++++++++------------------------ > - 2 files changed, 38 insertions(+), 37 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index c1908f0a..f9ce9504 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -29,6 +29,7 @@ VOID = /dev/null > - # fail on other tested distros (ubuntu, debian) even > - # without manually specifying the TARGET_SYSTEM. > - TARGET_SYSTEM ?= $(OS) > -+export OS > - > - ifneq (,$(filter Windows%,$(TARGET_SYSTEM))) > - EXT =.exe > -diff --git a/programs/Makefile b/programs/Makefile > -index 599fb02f..79b45c83 100644 > ---- a/programs/Makefile > -+++ b/programs/Makefile > -@@ -209,37 +209,37 @@ SET_CACHE_DIRECTORY = \ > - > - > - .PHONY: all > --all: zstd > -+all: zstd$(EXT) > - > - .PHONY: allVariants > --allVariants: zstd zstd-compress zstd-decompress zstd-small zstd-nolegacy zstd-dictBuilder > -+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT) zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT) > - > - .PHONY: zstd # must always be run > --zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP) > --zstd : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD) > --zstd : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD) > --zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) > -+zstd$(EXT) : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP) > -+zstd$(EXT) : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD) > -+zstd$(EXT) : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD) > -+zstd$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) > - ifneq (,$(filter Windows%,$(OS))) > --zstd : $(RES_FILE) > -+zstd$(EXT) : $(RES_FILE) > - endif > - > - ifndef BUILD_DIR > - # generate BUILD_DIR from flags > - > --zstd: > -+zstd$(EXT): > - $(SET_CACHE_DIRECTORY) > - > - else > - # BUILD_DIR is defined > - > - ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ)) > --$(BUILD_DIR)/zstd : $(ZSTD_OBJ) > -+$(BUILD_DIR)/zstd$(EXT) : $(ZSTD_OBJ) > - @echo "$(THREAD_MSG)" > - @echo "$(ZLIB_MSG)" > - @echo "$(LZMA_MSG)" > - @echo "$(LZ4_MSG)" > - @echo LINK $@ > -- $(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT) > -+ $(CC) $(FLAGS) $^ $(LDLIBS) -o $@ > - > - ifeq ($(HAVE_HASH),1) > - SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | cut -f 1 -d " ") > -@@ -249,7 +249,7 @@ else > - BIN_ISDIFFERENT = 1 > - endif > - > --zstd : $(BUILD_DIR)/zstd > -+zstd$(EXT) : $(BUILD_DIR)/zstd$(EXT) > - if [ $(BIN_ISDIFFERENT) -eq 1 ]; then \ > - cp -f $< $@; \ > - echo zstd build completed; \ > -@@ -263,46 +263,46 @@ endif # BUILD_DIR > - .PHONY: zstd-release > - zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0 > - zstd-release: DEBUGFLAGS_LD := > --zstd-release: zstd > -+zstd-release: zstd$(EXT) > - > --zstd32 : CPPFLAGS += $(THREAD_CPP) > --zstd32 : LDFLAGS += $(THREAD_LD) > --zstd32 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) > -+zstd32$(EXT) : CPPFLAGS += $(THREAD_CPP) > -+zstd32$(EXT) : LDFLAGS += $(THREAD_LD) > -+zstd32$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) > - ifneq (,$(filter Windows%,$(OS))) > --zstd32 : $(RES32_FILE) > -+zstd32$(EXT) : $(RES32_FILE) > - endif > --zstd32 : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC) > -- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) > -+zstd32$(EXT) : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC) > -+ $(CC) -m32 $(FLAGS) $^ -o $@ > - > - ## zstd-nolegacy: same scope as zstd, with just support of legacy formats removed > --zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) $(DEBUGFLAGS_LD) > --zstd-nolegacy : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ) > -- $(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS) > -+zstd-nolegacy$(EXT) : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) $(DEBUGFLAGS_LD) > -+zstd-nolegacy$(EXT) : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ) > -+ $(CC) $(FLAGS) $^ -o $@ $(LDFLAGS) > - > - .PHONY: zstd-nomt > - zstd-nomt : THREAD_CPP := > - zstd-nomt : THREAD_LD := > - zstd-nomt : THREAD_MSG := - multi-threading disabled > --zstd-nomt : zstd > -+zstd-nomt : zstd$(EXT) > - > - .PHONY: zstd-nogz > - zstd-nogz : ZLIBCPP := > - zstd-nogz : ZLIBLD := > - zstd-nogz : ZLIB_MSG := - gzip support is disabled > --zstd-nogz : zstd > -+zstd-nogz : zstd$(EXT) > - > - .PHONY: zstd-noxz > - zstd-noxz : LZMACPP := > - zstd-noxz : LZMALD := > - zstd-noxz : LZMA_MSG := - xz/lzma support is disabled > --zstd-noxz : zstd > -+zstd-noxz : zstd$(EXT) > - > - ## zstd-dll: zstd executable linked to dynamic library libzstd (must have same version) > - .PHONY: zstd-dll > - zstd-dll : LDFLAGS+= -L$(ZSTDDIR) > - zstd-dll : LDLIBS += -lzstd > - zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c > --zstd-dll : zstd > -+zstd-dll : zstd$(EXT) > - > - > - ## zstd-pgo: zstd executable optimized with PGO. > -@@ -321,23 +321,23 @@ zstd-pgo : > - $(MAKE) zstd MOREFLAGS=-fprofile-use > - > - ## zstd-small: minimal target, supporting only zstd compression and decompression. no bench. no legacy. no other format. > --zstd-small: CFLAGS = -Os -s > --zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c fileio.c > -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o $@$(EXT) > -+zstd-small$(EXT): CFLAGS = -Os -s > -+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c fileio.c > -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o $@ > - > --zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) zstdcli.c util.c timefn.c fileio.c > -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS -DZSTD_NOTRACE $^ -o $@$(EXT) > -+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) zstdcli.c util.c timefn.c fileio.c > -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS -DZSTD_NOTRACE $^ -o $@ > - > --zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c util.c timefn.c fileio.c > -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@$(EXT) > -+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c util.c timefn.c fileio.c > -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@ > - > - ## zstd-dictBuilder: executable supporting dictionary creation and compression (only) > --zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS -DZSTD_NOTRACE > --zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c > -- $(CC) $(FLAGS) $^ -o $@$(EXT) > -+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS -DZSTD_NOTRACE > -+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c > -+ $(CC) $(FLAGS) $^ -o $@ > - > --zstdmt: zstd > -- ln -sf zstd zstdmt > -+zstdmt$(EXT): zstd$(EXT) > -+ ln -sf zstd$(EXT) zstdmt$(EXT) > - > - .PHONY: generate_res > - generate_res: $(RES64_FILE) $(RES32_FILE) > --- > -2.31.1 > - > diff --git a/meta/recipes-extended/zstd/zstd_1.5.0.bb b/meta/recipes-extended/zstd/zstd_1.5.2.bb > similarity index 86% > rename from meta/recipes-extended/zstd/zstd_1.5.0.bb > rename to meta/recipes-extended/zstd/zstd_1.5.2.bb > index 51305d0562..71f439ef57 100644 > --- a/meta/recipes-extended/zstd/zstd_1.5.0.bb > +++ b/meta/recipes-extended/zstd/zstd_1.5.2.bb > @@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2" > LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ > file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" > > -SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https \ > - file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \ > - file://0001-MinGW-Build-Fixes.patch \ > - " > +SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https" > > -SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6" > +SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3" > UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" > > CVE_PRODUCT = "zstandard" > -- > 2.20.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#161033): https://lists.openembedded.org/g/openembedded-core/message/161033 > Mute This Topic: https://lists.openembedded.org/mt/88718362/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Thu, 27 Jan 2022 at 19:56, Khem Raj <raj.khem@gmail.com> wrote: > quick look shows that size of zstd package reduces quite a bit, I wonder > why > > -4720 KiB zstd > +2932 KiB zstd > > small is ofcourse better, but I wonder what could reduce it so much > between 1.5.0 and 1.5.2 > buildhistory-diff does not reveal anything fishy: alex@nereus:~/development/poky/build-64-alt$ buildhistory-diff Changes to packages/core2-64-poky-linux/zstd (sysroot): /usr/lib/libzstd.so.1 changed symlink target from libzstd.so.1.5.0 to libzstd.so.1.5.2 /usr/lib/libzstd.so changed symlink target from libzstd.so.1.5.0 to libzstd.so.1.5.2 /usr/lib/libzstd.so.1.5.0 moved to /usr/lib/libzstd.so.1.5.2 packages/core2-64-poky-linux/zstd/zstd-dbg: PKGSIZE changed from 23736192 to 16994448 (-28%) packages/core2-64-poky-linux/zstd/zstd-src: PKGSIZE changed from 2741079 to 3050284 (+11%) packages/core2-64-poky-linux/zstd/zstd-staticdev: PKGSIZE changed from 9332966 to 6596796 (-29%) packages/core2-64-poky-linux/zstd/zstd: PKGSIZE changed from 3279119 to 2407719 (-27%) packages/core2-64-poky-linux/zstd/zstd: FILELIST: removed "/usr/lib/libzstd.so.1.5.0", added "/usr/lib/libzstd.so.1.5.2" Changes to packages/x86_64-linux/zstd-native (sysroot): /usr/lib/libzstd.so.1 changed symlink target from libzstd.so.1.5.0 to libzstd.so.1.5.2 /usr/lib/libzstd.so changed symlink target from libzstd.so.1.5.0 to libzstd.so.1.5.2 /usr/lib/libzstd.so.1.5.0 moved to /usr/lib/libzstd.so.1.5.2 Alex > > On Thu, Jan 27, 2022 at 2:20 AM Alexander Kanavin > <alex.kanavin@gmail.com> wrote: > > > > Drop patches merged upstream. > > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > --- > > ...rt-all-wildcard-file-list-expansions.patch | 81 -------- > > .../zstd/zstd/0001-MinGW-Build-Fixes.patch | 193 ------------------ > > .../zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb} | 7 +- > > 3 files changed, 2 insertions(+), 279 deletions(-) > > delete mode 100644 > meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch > > delete mode 100644 > meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch > > rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb} > (86%) > > > > 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 > > deleted file mode 100644 > > index 3d23648f5b..0000000000 > > --- > a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch > > +++ /dev/null > > @@ -1,81 +0,0 @@ > > -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 > > - > > -Otherwise the order is non-deterministic and breaks > > -reproducible builds. > > - > > -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2895] > > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > - > > ---- > > - programs/Makefile | 10 +++++----- > > - tests/Makefile | 4 ++-- > > - tests/fuzz/Makefile | 2 +- > > - 3 files changed, 8 insertions(+), 8 deletions(-) > > - > > -diff --git a/programs/Makefile b/programs/Makefile > > -index 599fb02f..2c416467 100644 > > ---- a/programs/Makefile > > -+++ b/programs/Makefile > > -@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy > > - > > - vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS) > $(ZDICT_DIR) $(ZSTDLEGACY_DIR) > > - > > --ZSTDLIB_COMMON_C := $(wildcard $(ZSTDLIB_COMMON)/*.c) > > --ZSTDLIB_COMPRESS_C := $(wildcard $(ZSTDLIB_COMPRESS)/*.c) > > --ZSTDLIB_DECOMPRESS_C := $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c) > > -+ZSTDLIB_COMMON_C := $(sort $(wildcard $(ZSTDLIB_COMMON)/*.c)) > > -+ZSTDLIB_COMPRESS_C := $(sort $(wildcard $(ZSTDLIB_COMPRESS)/*.c)) > > -+ZSTDLIB_DECOMPRESS_C := $(sort $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c)) > > - ZSTDLIB_CORE_SRC := $(ZSTDLIB_DECOMPRESS_C) $(ZSTDLIB_COMMON_C) > $(ZSTDLIB_COMPRESS_C) > > --ZDICT_SRC := $(wildcard $(ZDICT_DIR)/*.c) > > -+ZDICT_SRC := $(sort $(wildcard $(ZDICT_DIR)/*.c)) > > - > > - ZSTD_LEGACY_SUPPORT ?= 5 > > - ZSTDLEGACY_SRC := > > -@@ -93,7 +93,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) > $(ZSTDLEGACY_SRC) $(ZDICT_SRC)) > > - ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC)) > > - ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o) > > - > > --ZSTD_CLI_SRC := $(wildcard *.c) > > -+ZSTD_CLI_SRC := $(sort $(wildcard *.c)) > > - ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o) > > - > > - ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC) > > -diff --git a/tests/Makefile b/tests/Makefile > > -index 85553007..b71cdba8 100644 > > ---- a/tests/Makefile > > -+++ b/tests/Makefile > > -@@ -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)) > > -+ZSTD_F1 := $(sort $(wildcard $(ZSTD_FILES))) > > - ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1)) > > - ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1)) > > - ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2)) > > -@@ -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 > > --legacy : $(ZSTD_FILES) $(wildcard $(ZSTDDIR)/legacy/*.c) legacy.c > > -+legacy : $(ZSTD_FILES) $(sort $(wildcard $(ZSTDDIR)/legacy/*.c)) > legacy.c > > - > > - 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 ccb574b7..b1cb2935 100644 > > ---- a/tests/fuzz/Makefile > > -+++ b/tests/fuzz/Makefile > > -@@ -62,7 +62,7 @@ FUZZ_SRC := \ > > - $(ZSTDCOMP_SRC) \ > > - $(ZSTDDICT_SRC) \ > > - $(ZSTDLEGACY_SRC) > > --FUZZ_SRC := $(wildcard $(FUZZ_SRC)) > > -+FUZZ_SRC := $(sort $(wildcard $(FUZZ_SRC))) > > - > > - FUZZ_D_OBJ1 := $(subst $(ZSTDDIR)/common/,d_lib_common_,$(FUZZ_SRC)) > > - FUZZ_D_OBJ2 := $(subst > $(ZSTDDIR)/compress/,d_lib_compress_,$(FUZZ_D_OBJ1)) > > diff --git > a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch > b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch > > deleted file mode 100644 > > index a0e00dca03..0000000000 > > --- a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch > > +++ /dev/null > > @@ -1,193 +0,0 @@ > > -From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001 > > -From: Joshua Watt <JPEWhacker@gmail.com> > > -Date: Wed, 26 May 2021 09:15:40 -0500 > > -Subject: [PATCH] MinGW Build Fixes > > - > > -Fixes building on MinGW by > > - 1) Exporting the OS variable so that it is visible to sub-make > > - invocations > > - 2) Fixing the extension handling so that make correctly identifies when > > - targets need to be rebuilt. Without the correct handling, make would > > - rebuild the executable targets when running `make install` because > > - it couldn't find them with the correct extension. > > - > > -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2685] > > -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> > > ---- > > - Makefile | 1 + > > - programs/Makefile | 74 +++++++++++++++++++++++------------------------ > > - 2 files changed, 38 insertions(+), 37 deletions(-) > > - > > -diff --git a/Makefile b/Makefile > > -index c1908f0a..f9ce9504 100644 > > ---- a/Makefile > > -+++ b/Makefile > > -@@ -29,6 +29,7 @@ VOID = /dev/null > > - # fail on other tested distros (ubuntu, debian) even > > - # without manually specifying the TARGET_SYSTEM. > > - TARGET_SYSTEM ?= $(OS) > > -+export OS > > - > > - ifneq (,$(filter Windows%,$(TARGET_SYSTEM))) > > - EXT =.exe > > -diff --git a/programs/Makefile b/programs/Makefile > > -index 599fb02f..79b45c83 100644 > > ---- a/programs/Makefile > > -+++ b/programs/Makefile > > -@@ -209,37 +209,37 @@ SET_CACHE_DIRECTORY = \ > > - > > - > > - .PHONY: all > > --all: zstd > > -+all: zstd$(EXT) > > - > > - .PHONY: allVariants > > --allVariants: zstd zstd-compress zstd-decompress zstd-small > zstd-nolegacy zstd-dictBuilder > > -+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT) > zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT) > > - > > - .PHONY: zstd # must always be run > > --zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP) > > --zstd : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD) > > --zstd : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD) > > --zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) > > -+zstd$(EXT) : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP) > > -+zstd$(EXT) : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD) > > -+zstd$(EXT) : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD) > > -+zstd$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) > > - ifneq (,$(filter Windows%,$(OS))) > > --zstd : $(RES_FILE) > > -+zstd$(EXT) : $(RES_FILE) > > - endif > > - > > - ifndef BUILD_DIR > > - # generate BUILD_DIR from flags > > - > > --zstd: > > -+zstd$(EXT): > > - $(SET_CACHE_DIRECTORY) > > - > > - else > > - # BUILD_DIR is defined > > - > > - ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ)) > > --$(BUILD_DIR)/zstd : $(ZSTD_OBJ) > > -+$(BUILD_DIR)/zstd$(EXT) : $(ZSTD_OBJ) > > - @echo "$(THREAD_MSG)" > > - @echo "$(ZLIB_MSG)" > > - @echo "$(LZMA_MSG)" > > - @echo "$(LZ4_MSG)" > > - @echo LINK $@ > > -- $(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT) > > -+ $(CC) $(FLAGS) $^ $(LDLIBS) -o $@ > > - > > - ifeq ($(HAVE_HASH),1) > > - SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | cut > -f 1 -d " ") > > -@@ -249,7 +249,7 @@ else > > - BIN_ISDIFFERENT = 1 > > - endif > > - > > --zstd : $(BUILD_DIR)/zstd > > -+zstd$(EXT) : $(BUILD_DIR)/zstd$(EXT) > > - if [ $(BIN_ISDIFFERENT) -eq 1 ]; then \ > > - cp -f $< $@; \ > > - echo zstd build completed; \ > > -@@ -263,46 +263,46 @@ endif # BUILD_DIR > > - .PHONY: zstd-release > > - zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0 > > - zstd-release: DEBUGFLAGS_LD := > > --zstd-release: zstd > > -+zstd-release: zstd$(EXT) > > - > > --zstd32 : CPPFLAGS += $(THREAD_CPP) > > --zstd32 : LDFLAGS += $(THREAD_LD) > > --zstd32 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) > > -+zstd32$(EXT) : CPPFLAGS += $(THREAD_CPP) > > -+zstd32$(EXT) : LDFLAGS += $(THREAD_LD) > > -+zstd32$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) > > - ifneq (,$(filter Windows%,$(OS))) > > --zstd32 : $(RES32_FILE) > > -+zstd32$(EXT) : $(RES32_FILE) > > - endif > > --zstd32 : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC) > > -- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) > > -+zstd32$(EXT) : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC) > > -+ $(CC) -m32 $(FLAGS) $^ -o $@ > > - > > - ## zstd-nolegacy: same scope as zstd, with just support of legacy > formats removed > > --zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) > $(DEBUGFLAGS_LD) > > --zstd-nolegacy : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ) > > -- $(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS) > > -+zstd-nolegacy$(EXT) : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) > $(LZ4LD) $(DEBUGFLAGS_LD) > > -+zstd-nolegacy$(EXT) : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ) > > -+ $(CC) $(FLAGS) $^ -o $@ $(LDFLAGS) > > - > > - .PHONY: zstd-nomt > > - zstd-nomt : THREAD_CPP := > > - zstd-nomt : THREAD_LD := > > - zstd-nomt : THREAD_MSG := - multi-threading disabled > > --zstd-nomt : zstd > > -+zstd-nomt : zstd$(EXT) > > - > > - .PHONY: zstd-nogz > > - zstd-nogz : ZLIBCPP := > > - zstd-nogz : ZLIBLD := > > - zstd-nogz : ZLIB_MSG := - gzip support is disabled > > --zstd-nogz : zstd > > -+zstd-nogz : zstd$(EXT) > > - > > - .PHONY: zstd-noxz > > - zstd-noxz : LZMACPP := > > - zstd-noxz : LZMALD := > > - zstd-noxz : LZMA_MSG := - xz/lzma support is disabled > > --zstd-noxz : zstd > > -+zstd-noxz : zstd$(EXT) > > - > > - ## zstd-dll: zstd executable linked to dynamic library libzstd (must > have same version) > > - .PHONY: zstd-dll > > - zstd-dll : LDFLAGS+= -L$(ZSTDDIR) > > - zstd-dll : LDLIBS += -lzstd > > - zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c > > --zstd-dll : zstd > > -+zstd-dll : zstd$(EXT) > > - > > - > > - ## zstd-pgo: zstd executable optimized with PGO. > > -@@ -321,23 +321,23 @@ zstd-pgo : > > - $(MAKE) zstd MOREFLAGS=-fprofile-use > > - > > - ## zstd-small: minimal target, supporting only zstd compression and > decompression. no bench. no legacy. no other format. > > --zstd-small: CFLAGS = -Os -s > > --zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c > fileio.c > > -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o > $@$(EXT) > > -+zstd-small$(EXT): CFLAGS = -Os -s > > -+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c > util.c timefn.c fileio.c > > -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o > $@ > > - > > --zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) zstdcli.c > util.c timefn.c fileio.c > > -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS > -DZSTD_NOTRACE $^ -o $@$(EXT) > > -+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) > zstdcli.c util.c timefn.c fileio.c > > -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS > -DZSTD_NOTRACE $^ -o $@ > > - > > --zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c > util.c timefn.c fileio.c > > -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS > -DZSTD_NOTRACE $^ -o $@$(EXT) > > -+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) > zstdcli.c util.c timefn.c fileio.c > > -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS > -DZSTD_NOTRACE $^ -o $@ > > - > > - ## zstd-dictBuilder: executable supporting dictionary creation and > compression (only) > > --zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS > -DZSTD_NOTRACE > > --zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) > $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c > > -- $(CC) $(FLAGS) $^ -o $@$(EXT) > > -+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS > -DZSTD_NOTRACE > > -+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) > $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c > > -+ $(CC) $(FLAGS) $^ -o $@ > > - > > --zstdmt: zstd > > -- ln -sf zstd zstdmt > > -+zstdmt$(EXT): zstd$(EXT) > > -+ ln -sf zstd$(EXT) zstdmt$(EXT) > > - > > - .PHONY: generate_res > > - generate_res: $(RES64_FILE) $(RES32_FILE) > > --- > > -2.31.1 > > - > > diff --git a/meta/recipes-extended/zstd/zstd_1.5.0.bb > b/meta/recipes-extended/zstd/zstd_1.5.2.bb > > similarity index 86% > > rename from meta/recipes-extended/zstd/zstd_1.5.0.bb > > rename to meta/recipes-extended/zstd/zstd_1.5.2.bb > > index 51305d0562..71f439ef57 100644 > > --- a/meta/recipes-extended/zstd/zstd_1.5.0.bb > > +++ b/meta/recipes-extended/zstd/zstd_1.5.2.bb > > @@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2" > > LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 > \ > > file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" > > > > -SRC_URI = "git:// > github.com/facebook/zstd.git;branch=release;protocol=https \ > > - > file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \ > > - file://0001-MinGW-Build-Fixes.patch \ > > - " > > +SRC_URI = "git:// > github.com/facebook/zstd.git;branch=release;protocol=https" > > > > -SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6" > > +SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3" > > UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" > > > > CVE_PRODUCT = "zstandard" > > -- > > 2.20.1 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#161033): > https://lists.openembedded.org/g/openembedded-core/message/161033 > > Mute This Topic: https://lists.openembedded.org/mt/88718362/1997914 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > raj.khem@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > >
I think zstd changelog for 1.5.1 settles the issue: https://github.com/facebook/zstd/releases/tag/v1.5.1 Alex On Thu, 27 Jan 2022 at 20:51, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > On Thu, 27 Jan 2022 at 19:56, Khem Raj <raj.khem@gmail.com> wrote: > >> quick look shows that size of zstd package reduces quite a bit, I wonder >> why >> >> -4720 KiB zstd >> +2932 KiB zstd >> >> small is ofcourse better, but I wonder what could reduce it so much >> between 1.5.0 and 1.5.2 >> > > buildhistory-diff does not reveal anything fishy: > > alex@nereus:~/development/poky/build-64-alt$ buildhistory-diff > Changes to packages/core2-64-poky-linux/zstd (sysroot): > /usr/lib/libzstd.so.1 changed symlink target from libzstd.so.1.5.0 to > libzstd.so.1.5.2 > /usr/lib/libzstd.so changed symlink target from libzstd.so.1.5.0 to > libzstd.so.1.5.2 > /usr/lib/libzstd.so.1.5.0 moved to /usr/lib/libzstd.so.1.5.2 > packages/core2-64-poky-linux/zstd/zstd-dbg: PKGSIZE changed from 23736192 > to 16994448 (-28%) > packages/core2-64-poky-linux/zstd/zstd-src: PKGSIZE changed from 2741079 > to 3050284 (+11%) > packages/core2-64-poky-linux/zstd/zstd-staticdev: PKGSIZE changed from > 9332966 to 6596796 (-29%) > packages/core2-64-poky-linux/zstd/zstd: PKGSIZE changed from 3279119 to > 2407719 (-27%) > packages/core2-64-poky-linux/zstd/zstd: FILELIST: removed > "/usr/lib/libzstd.so.1.5.0", added "/usr/lib/libzstd.so.1.5.2" > Changes to packages/x86_64-linux/zstd-native (sysroot): > /usr/lib/libzstd.so.1 changed symlink target from libzstd.so.1.5.0 to > libzstd.so.1.5.2 > /usr/lib/libzstd.so changed symlink target from libzstd.so.1.5.0 to > libzstd.so.1.5.2 > /usr/lib/libzstd.so.1.5.0 moved to /usr/lib/libzstd.so.1.5.2 > > Alex > > > > >> >> On Thu, Jan 27, 2022 at 2:20 AM Alexander Kanavin >> <alex.kanavin@gmail.com> wrote: >> > >> > Drop patches merged upstream. >> > >> > Signed-off-by: Alexander Kanavin <alex@linutronix.de> >> > --- >> > ...rt-all-wildcard-file-list-expansions.patch | 81 -------- >> > .../zstd/zstd/0001-MinGW-Build-Fixes.patch | 193 ------------------ >> > .../zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb} | 7 +- >> > 3 files changed, 2 insertions(+), 279 deletions(-) >> > delete mode 100644 >> meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch >> > delete mode 100644 >> meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch >> > rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb} >> (86%) >> > >> > 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 >> > deleted file mode 100644 >> > index 3d23648f5b..0000000000 >> > --- >> a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch >> > +++ /dev/null >> > @@ -1,81 +0,0 @@ >> > -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 >> > - >> > -Otherwise the order is non-deterministic and breaks >> > -reproducible builds. >> > - >> > -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2895 >> ] >> > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> > - >> > ---- >> > - programs/Makefile | 10 +++++----- >> > - tests/Makefile | 4 ++-- >> > - tests/fuzz/Makefile | 2 +- >> > - 3 files changed, 8 insertions(+), 8 deletions(-) >> > - >> > -diff --git a/programs/Makefile b/programs/Makefile >> > -index 599fb02f..2c416467 100644 >> > ---- a/programs/Makefile >> > -+++ b/programs/Makefile >> > -@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy >> > - >> > - vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS) >> $(ZDICT_DIR) $(ZSTDLEGACY_DIR) >> > - >> > --ZSTDLIB_COMMON_C := $(wildcard $(ZSTDLIB_COMMON)/*.c) >> > --ZSTDLIB_COMPRESS_C := $(wildcard $(ZSTDLIB_COMPRESS)/*.c) >> > --ZSTDLIB_DECOMPRESS_C := $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c) >> > -+ZSTDLIB_COMMON_C := $(sort $(wildcard $(ZSTDLIB_COMMON)/*.c)) >> > -+ZSTDLIB_COMPRESS_C := $(sort $(wildcard $(ZSTDLIB_COMPRESS)/*.c)) >> > -+ZSTDLIB_DECOMPRESS_C := $(sort $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c)) >> > - ZSTDLIB_CORE_SRC := $(ZSTDLIB_DECOMPRESS_C) $(ZSTDLIB_COMMON_C) >> $(ZSTDLIB_COMPRESS_C) >> > --ZDICT_SRC := $(wildcard $(ZDICT_DIR)/*.c) >> > -+ZDICT_SRC := $(sort $(wildcard $(ZDICT_DIR)/*.c)) >> > - >> > - ZSTD_LEGACY_SUPPORT ?= 5 >> > - ZSTDLEGACY_SRC := >> > -@@ -93,7 +93,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) >> $(ZSTDLEGACY_SRC) $(ZDICT_SRC)) >> > - ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC)) >> > - ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o) >> > - >> > --ZSTD_CLI_SRC := $(wildcard *.c) >> > -+ZSTD_CLI_SRC := $(sort $(wildcard *.c)) >> > - ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o) >> > - >> > - ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC) >> > -diff --git a/tests/Makefile b/tests/Makefile >> > -index 85553007..b71cdba8 100644 >> > ---- a/tests/Makefile >> > -+++ b/tests/Makefile >> > -@@ -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)) >> > -+ZSTD_F1 := $(sort $(wildcard $(ZSTD_FILES))) >> > - ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1)) >> > - ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1)) >> > - ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2)) >> > -@@ -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 >> > --legacy : $(ZSTD_FILES) $(wildcard $(ZSTDDIR)/legacy/*.c) legacy.c >> > -+legacy : $(ZSTD_FILES) $(sort $(wildcard $(ZSTDDIR)/legacy/*.c)) >> legacy.c >> > - >> > - 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 ccb574b7..b1cb2935 100644 >> > ---- a/tests/fuzz/Makefile >> > -+++ b/tests/fuzz/Makefile >> > -@@ -62,7 +62,7 @@ FUZZ_SRC := \ >> > - $(ZSTDCOMP_SRC) \ >> > - $(ZSTDDICT_SRC) \ >> > - $(ZSTDLEGACY_SRC) >> > --FUZZ_SRC := $(wildcard $(FUZZ_SRC)) >> > -+FUZZ_SRC := $(sort $(wildcard $(FUZZ_SRC))) >> > - >> > - FUZZ_D_OBJ1 := $(subst $(ZSTDDIR)/common/,d_lib_common_,$(FUZZ_SRC)) >> > - FUZZ_D_OBJ2 := $(subst >> $(ZSTDDIR)/compress/,d_lib_compress_,$(FUZZ_D_OBJ1)) >> > diff --git >> a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch >> b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch >> > deleted file mode 100644 >> > index a0e00dca03..0000000000 >> > --- a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch >> > +++ /dev/null >> > @@ -1,193 +0,0 @@ >> > -From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001 >> > -From: Joshua Watt <JPEWhacker@gmail.com> >> > -Date: Wed, 26 May 2021 09:15:40 -0500 >> > -Subject: [PATCH] MinGW Build Fixes >> > - >> > -Fixes building on MinGW by >> > - 1) Exporting the OS variable so that it is visible to sub-make >> > - invocations >> > - 2) Fixing the extension handling so that make correctly identifies >> when >> > - targets need to be rebuilt. Without the correct handling, make >> would >> > - rebuild the executable targets when running `make install` because >> > - it couldn't find them with the correct extension. >> > - >> > -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2685 >> ] >> > -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> >> > ---- >> > - Makefile | 1 + >> > - programs/Makefile | 74 +++++++++++++++++++++++------------------------ >> > - 2 files changed, 38 insertions(+), 37 deletions(-) >> > - >> > -diff --git a/Makefile b/Makefile >> > -index c1908f0a..f9ce9504 100644 >> > ---- a/Makefile >> > -+++ b/Makefile >> > -@@ -29,6 +29,7 @@ VOID = /dev/null >> > - # fail on other tested distros (ubuntu, debian) even >> > - # without manually specifying the TARGET_SYSTEM. >> > - TARGET_SYSTEM ?= $(OS) >> > -+export OS >> > - >> > - ifneq (,$(filter Windows%,$(TARGET_SYSTEM))) >> > - EXT =.exe >> > -diff --git a/programs/Makefile b/programs/Makefile >> > -index 599fb02f..79b45c83 100644 >> > ---- a/programs/Makefile >> > -+++ b/programs/Makefile >> > -@@ -209,37 +209,37 @@ SET_CACHE_DIRECTORY = \ >> > - >> > - >> > - .PHONY: all >> > --all: zstd >> > -+all: zstd$(EXT) >> > - >> > - .PHONY: allVariants >> > --allVariants: zstd zstd-compress zstd-decompress zstd-small >> zstd-nolegacy zstd-dictBuilder >> > -+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT) >> zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT) >> > - >> > - .PHONY: zstd # must always be run >> > --zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP) >> > --zstd : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD) >> > --zstd : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD) >> > --zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) >> > -+zstd$(EXT) : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP) >> > -+zstd$(EXT) : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD) >> > -+zstd$(EXT) : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD) >> > -+zstd$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) >> > - ifneq (,$(filter Windows%,$(OS))) >> > --zstd : $(RES_FILE) >> > -+zstd$(EXT) : $(RES_FILE) >> > - endif >> > - >> > - ifndef BUILD_DIR >> > - # generate BUILD_DIR from flags >> > - >> > --zstd: >> > -+zstd$(EXT): >> > - $(SET_CACHE_DIRECTORY) >> > - >> > - else >> > - # BUILD_DIR is defined >> > - >> > - ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ)) >> > --$(BUILD_DIR)/zstd : $(ZSTD_OBJ) >> > -+$(BUILD_DIR)/zstd$(EXT) : $(ZSTD_OBJ) >> > - @echo "$(THREAD_MSG)" >> > - @echo "$(ZLIB_MSG)" >> > - @echo "$(LZMA_MSG)" >> > - @echo "$(LZ4_MSG)" >> > - @echo LINK $@ >> > -- $(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT) >> > -+ $(CC) $(FLAGS) $^ $(LDLIBS) -o $@ >> > - >> > - ifeq ($(HAVE_HASH),1) >> > - SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | >> cut -f 1 -d " ") >> > -@@ -249,7 +249,7 @@ else >> > - BIN_ISDIFFERENT = 1 >> > - endif >> > - >> > --zstd : $(BUILD_DIR)/zstd >> > -+zstd$(EXT) : $(BUILD_DIR)/zstd$(EXT) >> > - if [ $(BIN_ISDIFFERENT) -eq 1 ]; then \ >> > - cp -f $< $@; \ >> > - echo zstd build completed; \ >> > -@@ -263,46 +263,46 @@ endif # BUILD_DIR >> > - .PHONY: zstd-release >> > - zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0 >> > - zstd-release: DEBUGFLAGS_LD := >> > --zstd-release: zstd >> > -+zstd-release: zstd$(EXT) >> > - >> > --zstd32 : CPPFLAGS += $(THREAD_CPP) >> > --zstd32 : LDFLAGS += $(THREAD_LD) >> > --zstd32 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) >> > -+zstd32$(EXT) : CPPFLAGS += $(THREAD_CPP) >> > -+zstd32$(EXT) : LDFLAGS += $(THREAD_LD) >> > -+zstd32$(EXT) : CPPFLAGS += >> -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) >> > - ifneq (,$(filter Windows%,$(OS))) >> > --zstd32 : $(RES32_FILE) >> > -+zstd32$(EXT) : $(RES32_FILE) >> > - endif >> > --zstd32 : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC) >> > -- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) >> > -+zstd32$(EXT) : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC) >> > -+ $(CC) -m32 $(FLAGS) $^ -o $@ >> > - >> > - ## zstd-nolegacy: same scope as zstd, with just support of legacy >> formats removed >> > --zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) >> $(DEBUGFLAGS_LD) >> > --zstd-nolegacy : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ) >> > -- $(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS) >> > -+zstd-nolegacy$(EXT) : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) >> $(LZ4LD) $(DEBUGFLAGS_LD) >> > -+zstd-nolegacy$(EXT) : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ) >> > -+ $(CC) $(FLAGS) $^ -o $@ $(LDFLAGS) >> > - >> > - .PHONY: zstd-nomt >> > - zstd-nomt : THREAD_CPP := >> > - zstd-nomt : THREAD_LD := >> > - zstd-nomt : THREAD_MSG := - multi-threading disabled >> > --zstd-nomt : zstd >> > -+zstd-nomt : zstd$(EXT) >> > - >> > - .PHONY: zstd-nogz >> > - zstd-nogz : ZLIBCPP := >> > - zstd-nogz : ZLIBLD := >> > - zstd-nogz : ZLIB_MSG := - gzip support is disabled >> > --zstd-nogz : zstd >> > -+zstd-nogz : zstd$(EXT) >> > - >> > - .PHONY: zstd-noxz >> > - zstd-noxz : LZMACPP := >> > - zstd-noxz : LZMALD := >> > - zstd-noxz : LZMA_MSG := - xz/lzma support is disabled >> > --zstd-noxz : zstd >> > -+zstd-noxz : zstd$(EXT) >> > - >> > - ## zstd-dll: zstd executable linked to dynamic library libzstd (must >> have same version) >> > - .PHONY: zstd-dll >> > - zstd-dll : LDFLAGS+= -L$(ZSTDDIR) >> > - zstd-dll : LDLIBS += -lzstd >> > - zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c >> > --zstd-dll : zstd >> > -+zstd-dll : zstd$(EXT) >> > - >> > - >> > - ## zstd-pgo: zstd executable optimized with PGO. >> > -@@ -321,23 +321,23 @@ zstd-pgo : >> > - $(MAKE) zstd MOREFLAGS=-fprofile-use >> > - >> > - ## zstd-small: minimal target, supporting only zstd compression and >> decompression. no bench. no legacy. no other format. >> > --zstd-small: CFLAGS = -Os -s >> > --zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c >> fileio.c >> > -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ >> -o $@$(EXT) >> > -+zstd-small$(EXT): CFLAGS = -Os -s >> > -+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c >> util.c timefn.c fileio.c >> > -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ >> -o $@ >> > - >> > --zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) >> zstdcli.c util.c timefn.c fileio.c >> > -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS >> -DZSTD_NOTRACE $^ -o $@$(EXT) >> > -+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) >> zstdcli.c util.c timefn.c fileio.c >> > -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS >> -DZSTD_NOTRACE $^ -o $@ >> > - >> > --zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c >> util.c timefn.c fileio.c >> > -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS >> -DZSTD_NOTRACE $^ -o $@$(EXT) >> > -+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) >> zstdcli.c util.c timefn.c fileio.c >> > -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS >> -DZSTD_NOTRACE $^ -o $@ >> > - >> > - ## zstd-dictBuilder: executable supporting dictionary creation and >> compression (only) >> > --zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS >> -DZSTD_NOTRACE >> > --zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) >> $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c >> > -- $(CC) $(FLAGS) $^ -o $@$(EXT) >> > -+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH >> -DZSTD_NODECOMPRESS -DZSTD_NOTRACE >> > -+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) >> $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c >> > -+ $(CC) $(FLAGS) $^ -o $@ >> > - >> > --zstdmt: zstd >> > -- ln -sf zstd zstdmt >> > -+zstdmt$(EXT): zstd$(EXT) >> > -+ ln -sf zstd$(EXT) zstdmt$(EXT) >> > - >> > - .PHONY: generate_res >> > - generate_res: $(RES64_FILE) $(RES32_FILE) >> > --- >> > -2.31.1 >> > - >> > diff --git a/meta/recipes-extended/zstd/zstd_1.5.0.bb >> b/meta/recipes-extended/zstd/zstd_1.5.2.bb >> > similarity index 86% >> > rename from meta/recipes-extended/zstd/zstd_1.5.0.bb >> > rename to meta/recipes-extended/zstd/zstd_1.5.2.bb >> > index 51305d0562..71f439ef57 100644 >> > --- a/meta/recipes-extended/zstd/zstd_1.5.0.bb >> > +++ b/meta/recipes-extended/zstd/zstd_1.5.2.bb >> > @@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2" >> > LIC_FILES_CHKSUM = >> "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ >> > >> file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" >> > >> > -SRC_URI = "git:// >> github.com/facebook/zstd.git;branch=release;protocol=https \ >> > - >> file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \ >> > - file://0001-MinGW-Build-Fixes.patch \ >> > - " >> > +SRC_URI = "git:// >> github.com/facebook/zstd.git;branch=release;protocol=https" >> > >> > -SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6" >> > +SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3" >> > UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" >> > >> > CVE_PRODUCT = "zstandard" >> > -- >> > 2.20.1 >> > >> > >> > >> > >> > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#161053): > https://lists.openembedded.org/g/openembedded-core/message/161053 > Mute This Topic: https://lists.openembedded.org/mt/88718362/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
On Thu, Jan 27, 2022 at 12:10 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > I think zstd changelog for 1.5.1 settles the issue: > > https://github.com/facebook/zstd/releases/tag/v1.5.1 > Yeah indeed thanks > > Alex > > On Thu, 27 Jan 2022 at 20:51, Alexander Kanavin via lists.openembedded.org > <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > >> On Thu, 27 Jan 2022 at 19:56, Khem Raj <raj.khem@gmail.com> wrote: >> >>> quick look shows that size of zstd package reduces quite a bit, I wonder >>> why >>> >>> -4720 KiB zstd >>> +2932 KiB zstd >>> >>> small is ofcourse better, but I wonder what could reduce it so much >>> between 1.5.0 and 1.5.2 >>> >> >> buildhistory-diff does not reveal anything fishy: >> >> alex@nereus:~/development/poky/build-64-alt$ buildhistory-diff >> Changes to packages/core2-64-poky-linux/zstd (sysroot): >> /usr/lib/libzstd.so.1 changed symlink target from libzstd.so.1.5.0 to >> libzstd.so.1.5.2 >> /usr/lib/libzstd.so changed symlink target from libzstd.so.1.5.0 to >> libzstd.so.1.5.2 >> /usr/lib/libzstd.so.1.5.0 moved to /usr/lib/libzstd.so.1.5.2 >> packages/core2-64-poky-linux/zstd/zstd-dbg: PKGSIZE changed from 23736192 >> to 16994448 (-28%) >> packages/core2-64-poky-linux/zstd/zstd-src: PKGSIZE changed from 2741079 >> to 3050284 (+11%) >> packages/core2-64-poky-linux/zstd/zstd-staticdev: PKGSIZE changed from >> 9332966 to 6596796 (-29%) >> packages/core2-64-poky-linux/zstd/zstd: PKGSIZE changed from 3279119 to >> 2407719 (-27%) >> packages/core2-64-poky-linux/zstd/zstd: FILELIST: removed >> "/usr/lib/libzstd.so.1.5.0", added "/usr/lib/libzstd.so.1.5.2" >> Changes to packages/x86_64-linux/zstd-native (sysroot): >> /usr/lib/libzstd.so.1 changed symlink target from libzstd.so.1.5.0 to >> libzstd.so.1.5.2 >> /usr/lib/libzstd.so changed symlink target from libzstd.so.1.5.0 to >> libzstd.so.1.5.2 >> /usr/lib/libzstd.so.1.5.0 moved to /usr/lib/libzstd.so.1.5.2 >> >> Alex >> >> >> >> >>> >>> On Thu, Jan 27, 2022 at 2:20 AM Alexander Kanavin >>> <alex.kanavin@gmail.com> wrote: >>> > >>> > Drop patches merged upstream. >>> > >>> > Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>> > --- >>> > ...rt-all-wildcard-file-list-expansions.patch | 81 -------- >>> > .../zstd/zstd/0001-MinGW-Build-Fixes.patch | 193 ------------------ >>> > .../zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb} | 7 +- >>> > 3 files changed, 2 insertions(+), 279 deletions(-) >>> > delete mode 100644 >>> meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch >>> > delete mode 100644 >>> meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch >>> > rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb} >>> (86%) >>> > >>> > 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 >>> > deleted file mode 100644 >>> > index 3d23648f5b..0000000000 >>> > --- >>> a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch >>> > +++ /dev/null >>> > @@ -1,81 +0,0 @@ >>> > -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 >>> > - >>> > -Otherwise the order is non-deterministic and breaks >>> > -reproducible builds. >>> > - >>> > -Upstream-Status: Submitted [ >>> https://github.com/facebook/zstd/pull/2895] >>> > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >>> > - >>> > ---- >>> > - programs/Makefile | 10 +++++----- >>> > - tests/Makefile | 4 ++-- >>> > - tests/fuzz/Makefile | 2 +- >>> > - 3 files changed, 8 insertions(+), 8 deletions(-) >>> > - >>> > -diff --git a/programs/Makefile b/programs/Makefile >>> > -index 599fb02f..2c416467 100644 >>> > ---- a/programs/Makefile >>> > -+++ b/programs/Makefile >>> > -@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy >>> > - >>> > - vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) >>> $(ZSTDLIB_DECOMPRESS) $(ZDICT_DIR) $(ZSTDLEGACY_DIR) >>> > - >>> > --ZSTDLIB_COMMON_C := $(wildcard $(ZSTDLIB_COMMON)/*.c) >>> > --ZSTDLIB_COMPRESS_C := $(wildcard $(ZSTDLIB_COMPRESS)/*.c) >>> > --ZSTDLIB_DECOMPRESS_C := $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c) >>> > -+ZSTDLIB_COMMON_C := $(sort $(wildcard $(ZSTDLIB_COMMON)/*.c)) >>> > -+ZSTDLIB_COMPRESS_C := $(sort $(wildcard $(ZSTDLIB_COMPRESS)/*.c)) >>> > -+ZSTDLIB_DECOMPRESS_C := $(sort $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c)) >>> > - ZSTDLIB_CORE_SRC := $(ZSTDLIB_DECOMPRESS_C) $(ZSTDLIB_COMMON_C) >>> $(ZSTDLIB_COMPRESS_C) >>> > --ZDICT_SRC := $(wildcard $(ZDICT_DIR)/*.c) >>> > -+ZDICT_SRC := $(sort $(wildcard $(ZDICT_DIR)/*.c)) >>> > - >>> > - ZSTD_LEGACY_SUPPORT ?= 5 >>> > - ZSTDLEGACY_SRC := >>> > -@@ -93,7 +93,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) >>> $(ZSTDLEGACY_SRC) $(ZDICT_SRC)) >>> > - ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC)) >>> > - ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o) >>> > - >>> > --ZSTD_CLI_SRC := $(wildcard *.c) >>> > -+ZSTD_CLI_SRC := $(sort $(wildcard *.c)) >>> > - ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o) >>> > - >>> > - ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC) >>> > -diff --git a/tests/Makefile b/tests/Makefile >>> > -index 85553007..b71cdba8 100644 >>> > ---- a/tests/Makefile >>> > -+++ b/tests/Makefile >>> > -@@ -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)) >>> > -+ZSTD_F1 := $(sort $(wildcard $(ZSTD_FILES))) >>> > - ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1)) >>> > - ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1)) >>> > - ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2)) >>> > -@@ -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 >>> > --legacy : $(ZSTD_FILES) $(wildcard $(ZSTDDIR)/legacy/*.c) legacy.c >>> > -+legacy : $(ZSTD_FILES) $(sort $(wildcard $(ZSTDDIR)/legacy/*.c)) >>> legacy.c >>> > - >>> > - 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 ccb574b7..b1cb2935 100644 >>> > ---- a/tests/fuzz/Makefile >>> > -+++ b/tests/fuzz/Makefile >>> > -@@ -62,7 +62,7 @@ FUZZ_SRC := \ >>> > - $(ZSTDCOMP_SRC) \ >>> > - $(ZSTDDICT_SRC) \ >>> > - $(ZSTDLEGACY_SRC) >>> > --FUZZ_SRC := $(wildcard $(FUZZ_SRC)) >>> > -+FUZZ_SRC := $(sort $(wildcard $(FUZZ_SRC))) >>> > - >>> > - FUZZ_D_OBJ1 := $(subst $(ZSTDDIR)/common/,d_lib_common_,$(FUZZ_SRC)) >>> > - FUZZ_D_OBJ2 := $(subst >>> $(ZSTDDIR)/compress/,d_lib_compress_,$(FUZZ_D_OBJ1)) >>> > diff --git >>> a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch >>> b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch >>> > deleted file mode 100644 >>> > index a0e00dca03..0000000000 >>> > --- a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch >>> > +++ /dev/null >>> > @@ -1,193 +0,0 @@ >>> > -From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001 >>> > -From: Joshua Watt <JPEWhacker@gmail.com> >>> > -Date: Wed, 26 May 2021 09:15:40 -0500 >>> > -Subject: [PATCH] MinGW Build Fixes >>> > - >>> > -Fixes building on MinGW by >>> > - 1) Exporting the OS variable so that it is visible to sub-make >>> > - invocations >>> > - 2) Fixing the extension handling so that make correctly identifies >>> when >>> > - targets need to be rebuilt. Without the correct handling, make >>> would >>> > - rebuild the executable targets when running `make install` because >>> > - it couldn't find them with the correct extension. >>> > - >>> > -Upstream-Status: Submitted [ >>> https://github.com/facebook/zstd/pull/2685] >>> > -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> >>> > ---- >>> > - Makefile | 1 + >>> > - programs/Makefile | 74 >>> +++++++++++++++++++++++------------------------ >>> > - 2 files changed, 38 insertions(+), 37 deletions(-) >>> > - >>> > -diff --git a/Makefile b/Makefile >>> > -index c1908f0a..f9ce9504 100644 >>> > ---- a/Makefile >>> > -+++ b/Makefile >>> > -@@ -29,6 +29,7 @@ VOID = /dev/null >>> > - # fail on other tested distros (ubuntu, debian) even >>> > - # without manually specifying the TARGET_SYSTEM. >>> > - TARGET_SYSTEM ?= $(OS) >>> > -+export OS >>> > - >>> > - ifneq (,$(filter Windows%,$(TARGET_SYSTEM))) >>> > - EXT =.exe >>> > -diff --git a/programs/Makefile b/programs/Makefile >>> > -index 599fb02f..79b45c83 100644 >>> > ---- a/programs/Makefile >>> > -+++ b/programs/Makefile >>> > -@@ -209,37 +209,37 @@ SET_CACHE_DIRECTORY = \ >>> > - >>> > - >>> > - .PHONY: all >>> > --all: zstd >>> > -+all: zstd$(EXT) >>> > - >>> > - .PHONY: allVariants >>> > --allVariants: zstd zstd-compress zstd-decompress zstd-small >>> zstd-nolegacy zstd-dictBuilder >>> > -+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT) >>> zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT) >>> > - >>> > - .PHONY: zstd # must always be run >>> > --zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP) >>> > --zstd : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD) >>> > --zstd : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD) >>> > --zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) >>> > -+zstd$(EXT) : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) >>> $(LZ4CPP) >>> > -+zstd$(EXT) : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD) >>> > -+zstd$(EXT) : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD) >>> > -+zstd$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) >>> > - ifneq (,$(filter Windows%,$(OS))) >>> > --zstd : $(RES_FILE) >>> > -+zstd$(EXT) : $(RES_FILE) >>> > - endif >>> > - >>> > - ifndef BUILD_DIR >>> > - # generate BUILD_DIR from flags >>> > - >>> > --zstd: >>> > -+zstd$(EXT): >>> > - $(SET_CACHE_DIRECTORY) >>> > - >>> > - else >>> > - # BUILD_DIR is defined >>> > - >>> > - ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ)) >>> > --$(BUILD_DIR)/zstd : $(ZSTD_OBJ) >>> > -+$(BUILD_DIR)/zstd$(EXT) : $(ZSTD_OBJ) >>> > - @echo "$(THREAD_MSG)" >>> > - @echo "$(ZLIB_MSG)" >>> > - @echo "$(LZMA_MSG)" >>> > - @echo "$(LZ4_MSG)" >>> > - @echo LINK $@ >>> > -- $(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT) >>> > -+ $(CC) $(FLAGS) $^ $(LDLIBS) -o $@ >>> > - >>> > - ifeq ($(HAVE_HASH),1) >>> > - SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | >>> cut -f 1 -d " ") >>> > -@@ -249,7 +249,7 @@ else >>> > - BIN_ISDIFFERENT = 1 >>> > - endif >>> > - >>> > --zstd : $(BUILD_DIR)/zstd >>> > -+zstd$(EXT) : $(BUILD_DIR)/zstd$(EXT) >>> > - if [ $(BIN_ISDIFFERENT) -eq 1 ]; then \ >>> > - cp -f $< $@; \ >>> > - echo zstd build completed; \ >>> > -@@ -263,46 +263,46 @@ endif # BUILD_DIR >>> > - .PHONY: zstd-release >>> > - zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0 >>> > - zstd-release: DEBUGFLAGS_LD := >>> > --zstd-release: zstd >>> > -+zstd-release: zstd$(EXT) >>> > - >>> > --zstd32 : CPPFLAGS += $(THREAD_CPP) >>> > --zstd32 : LDFLAGS += $(THREAD_LD) >>> > --zstd32 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) >>> > -+zstd32$(EXT) : CPPFLAGS += $(THREAD_CPP) >>> > -+zstd32$(EXT) : LDFLAGS += $(THREAD_LD) >>> > -+zstd32$(EXT) : CPPFLAGS += >>> -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) >>> > - ifneq (,$(filter Windows%,$(OS))) >>> > --zstd32 : $(RES32_FILE) >>> > -+zstd32$(EXT) : $(RES32_FILE) >>> > - endif >>> > --zstd32 : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC) >>> > -- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) >>> > -+zstd32$(EXT) : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC) >>> > -+ $(CC) -m32 $(FLAGS) $^ -o $@ >>> > - >>> > - ## zstd-nolegacy: same scope as zstd, with just support of legacy >>> formats removed >>> > --zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) >>> $(DEBUGFLAGS_LD) >>> > --zstd-nolegacy : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ) >>> > -- $(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS) >>> > -+zstd-nolegacy$(EXT) : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) >>> $(LZ4LD) $(DEBUGFLAGS_LD) >>> > -+zstd-nolegacy$(EXT) : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) >>> $(ZSTD_CLI_OBJ) >>> > -+ $(CC) $(FLAGS) $^ -o $@ $(LDFLAGS) >>> > - >>> > - .PHONY: zstd-nomt >>> > - zstd-nomt : THREAD_CPP := >>> > - zstd-nomt : THREAD_LD := >>> > - zstd-nomt : THREAD_MSG := - multi-threading disabled >>> > --zstd-nomt : zstd >>> > -+zstd-nomt : zstd$(EXT) >>> > - >>> > - .PHONY: zstd-nogz >>> > - zstd-nogz : ZLIBCPP := >>> > - zstd-nogz : ZLIBLD := >>> > - zstd-nogz : ZLIB_MSG := - gzip support is disabled >>> > --zstd-nogz : zstd >>> > -+zstd-nogz : zstd$(EXT) >>> > - >>> > - .PHONY: zstd-noxz >>> > - zstd-noxz : LZMACPP := >>> > - zstd-noxz : LZMALD := >>> > - zstd-noxz : LZMA_MSG := - xz/lzma support is disabled >>> > --zstd-noxz : zstd >>> > -+zstd-noxz : zstd$(EXT) >>> > - >>> > - ## zstd-dll: zstd executable linked to dynamic library libzstd (must >>> have same version) >>> > - .PHONY: zstd-dll >>> > - zstd-dll : LDFLAGS+= -L$(ZSTDDIR) >>> > - zstd-dll : LDLIBS += -lzstd >>> > - zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c >>> > --zstd-dll : zstd >>> > -+zstd-dll : zstd$(EXT) >>> > - >>> > - >>> > - ## zstd-pgo: zstd executable optimized with PGO. >>> > -@@ -321,23 +321,23 @@ zstd-pgo : >>> > - $(MAKE) zstd MOREFLAGS=-fprofile-use >>> > - >>> > - ## zstd-small: minimal target, supporting only zstd compression and >>> decompression. no bench. no legacy. no other format. >>> > --zstd-small: CFLAGS = -Os -s >>> > --zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c >>> timefn.c fileio.c >>> > -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ >>> -o $@$(EXT) >>> > -+zstd-small$(EXT): CFLAGS = -Os -s >>> > -+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c >>> util.c timefn.c fileio.c >>> > -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ >>> -o $@ >>> > - >>> > --zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) >>> zstdcli.c util.c timefn.c fileio.c >>> > -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS >>> -DZSTD_NOTRACE $^ -o $@$(EXT) >>> > -+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) >>> zstdcli.c util.c timefn.c fileio.c >>> > -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS >>> -DZSTD_NOTRACE $^ -o $@ >>> > - >>> > --zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c >>> util.c timefn.c fileio.c >>> > -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT >>> -DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@$(EXT) >>> > -+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) >>> zstdcli.c util.c timefn.c fileio.c >>> > -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT >>> -DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@ >>> > - >>> > - ## zstd-dictBuilder: executable supporting dictionary creation and >>> compression (only) >>> > --zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS >>> -DZSTD_NOTRACE >>> > --zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) >>> $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c >>> > -- $(CC) $(FLAGS) $^ -o $@$(EXT) >>> > -+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH >>> -DZSTD_NODECOMPRESS -DZSTD_NOTRACE >>> > -+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) >>> $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c >>> > -+ $(CC) $(FLAGS) $^ -o $@ >>> > - >>> > --zstdmt: zstd >>> > -- ln -sf zstd zstdmt >>> > -+zstdmt$(EXT): zstd$(EXT) >>> > -+ ln -sf zstd$(EXT) zstdmt$(EXT) >>> > - >>> > - .PHONY: generate_res >>> > - generate_res: $(RES64_FILE) $(RES32_FILE) >>> > --- >>> > -2.31.1 >>> > - >>> > diff --git a/meta/recipes-extended/zstd/zstd_1.5.0.bb >>> b/meta/recipes-extended/zstd/zstd_1.5.2.bb >>> > similarity index 86% >>> > rename from meta/recipes-extended/zstd/zstd_1.5.0.bb >>> > rename to meta/recipes-extended/zstd/zstd_1.5.2.bb >>> > index 51305d0562..71f439ef57 100644 >>> > --- a/meta/recipes-extended/zstd/zstd_1.5.0.bb >>> > +++ b/meta/recipes-extended/zstd/zstd_1.5.2.bb >>> > @@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2" >>> > LIC_FILES_CHKSUM = >>> "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ >>> > >>> file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" >>> > >>> > -SRC_URI = "git:// >>> github.com/facebook/zstd.git;branch=release;protocol=https \ >>> > - >>> file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \ >>> > - file://0001-MinGW-Build-Fixes.patch \ >>> > - " >>> > +SRC_URI = "git:// >>> github.com/facebook/zstd.git;branch=release;protocol=https" >>> > >>> > -SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6" >>> > +SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3" >>> > UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" >>> > >>> > CVE_PRODUCT = "zstandard" >>> > -- >>> > 2.20.1 >>> > >>> > >>> > >>> > >>> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> > View/Reply Online (#161053): >> https://lists.openembedded.org/g/openembedded-core/message/161053 >> Mute This Topic: https://lists.openembedded.org/mt/88718362/1686489 >> Group Owner: openembedded-core+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ >> alex.kanavin@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >> >>
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 deleted file mode 100644 index 3d23648f5b..0000000000 --- a/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch +++ /dev/null @@ -1,81 +0,0 @@ -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 - -Otherwise the order is non-deterministic and breaks -reproducible builds. - -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2895] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - programs/Makefile | 10 +++++----- - tests/Makefile | 4 ++-- - tests/fuzz/Makefile | 2 +- - 3 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/programs/Makefile b/programs/Makefile -index 599fb02f..2c416467 100644 ---- a/programs/Makefile -+++ b/programs/Makefile -@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy - - vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS) $(ZDICT_DIR) $(ZSTDLEGACY_DIR) - --ZSTDLIB_COMMON_C := $(wildcard $(ZSTDLIB_COMMON)/*.c) --ZSTDLIB_COMPRESS_C := $(wildcard $(ZSTDLIB_COMPRESS)/*.c) --ZSTDLIB_DECOMPRESS_C := $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c) -+ZSTDLIB_COMMON_C := $(sort $(wildcard $(ZSTDLIB_COMMON)/*.c)) -+ZSTDLIB_COMPRESS_C := $(sort $(wildcard $(ZSTDLIB_COMPRESS)/*.c)) -+ZSTDLIB_DECOMPRESS_C := $(sort $(wildcard $(ZSTDLIB_DECOMPRESS)/*.c)) - ZSTDLIB_CORE_SRC := $(ZSTDLIB_DECOMPRESS_C) $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) --ZDICT_SRC := $(wildcard $(ZDICT_DIR)/*.c) -+ZDICT_SRC := $(sort $(wildcard $(ZDICT_DIR)/*.c)) - - ZSTD_LEGACY_SUPPORT ?= 5 - ZSTDLEGACY_SRC := -@@ -93,7 +93,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) $(ZSTDLEGACY_SRC) $(ZDICT_SRC)) - ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC)) - ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o) - --ZSTD_CLI_SRC := $(wildcard *.c) -+ZSTD_CLI_SRC := $(sort $(wildcard *.c)) - ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o) - - ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC) -diff --git a/tests/Makefile b/tests/Makefile -index 85553007..b71cdba8 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -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)) -+ZSTD_F1 := $(sort $(wildcard $(ZSTD_FILES))) - ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1)) - ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1)) - ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2)) -@@ -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 --legacy : $(ZSTD_FILES) $(wildcard $(ZSTDDIR)/legacy/*.c) legacy.c -+legacy : $(ZSTD_FILES) $(sort $(wildcard $(ZSTDDIR)/legacy/*.c)) legacy.c - - 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 ccb574b7..b1cb2935 100644 ---- a/tests/fuzz/Makefile -+++ b/tests/fuzz/Makefile -@@ -62,7 +62,7 @@ FUZZ_SRC := \ - $(ZSTDCOMP_SRC) \ - $(ZSTDDICT_SRC) \ - $(ZSTDLEGACY_SRC) --FUZZ_SRC := $(wildcard $(FUZZ_SRC)) -+FUZZ_SRC := $(sort $(wildcard $(FUZZ_SRC))) - - FUZZ_D_OBJ1 := $(subst $(ZSTDDIR)/common/,d_lib_common_,$(FUZZ_SRC)) - FUZZ_D_OBJ2 := $(subst $(ZSTDDIR)/compress/,d_lib_compress_,$(FUZZ_D_OBJ1)) diff --git a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch b/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch deleted file mode 100644 index a0e00dca03..0000000000 --- a/meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch +++ /dev/null @@ -1,193 +0,0 @@ -From ab9a34c92eec815ef214470c927ddbe2e950e7e5 Mon Sep 17 00:00:00 2001 -From: Joshua Watt <JPEWhacker@gmail.com> -Date: Wed, 26 May 2021 09:15:40 -0500 -Subject: [PATCH] MinGW Build Fixes - -Fixes building on MinGW by - 1) Exporting the OS variable so that it is visible to sub-make - invocations - 2) Fixing the extension handling so that make correctly identifies when - targets need to be rebuilt. Without the correct handling, make would - rebuild the executable targets when running `make install` because - it couldn't find them with the correct extension. - -Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/2685] -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> ---- - Makefile | 1 + - programs/Makefile | 74 +++++++++++++++++++++++------------------------ - 2 files changed, 38 insertions(+), 37 deletions(-) - -diff --git a/Makefile b/Makefile -index c1908f0a..f9ce9504 100644 ---- a/Makefile -+++ b/Makefile -@@ -29,6 +29,7 @@ VOID = /dev/null - # fail on other tested distros (ubuntu, debian) even - # without manually specifying the TARGET_SYSTEM. - TARGET_SYSTEM ?= $(OS) -+export OS - - ifneq (,$(filter Windows%,$(TARGET_SYSTEM))) - EXT =.exe -diff --git a/programs/Makefile b/programs/Makefile -index 599fb02f..79b45c83 100644 ---- a/programs/Makefile -+++ b/programs/Makefile -@@ -209,37 +209,37 @@ SET_CACHE_DIRECTORY = \ - - - .PHONY: all --all: zstd -+all: zstd$(EXT) - - .PHONY: allVariants --allVariants: zstd zstd-compress zstd-decompress zstd-small zstd-nolegacy zstd-dictBuilder -+allVariants: zstd$(EXT) zstd-compress$(EXT) zstd-decompress$(EXT) zstd-small$(EXT) zstd-nolegacy$(EXT) zstd-dictBuilder$(EXT) - - .PHONY: zstd # must always be run --zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP) --zstd : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD) --zstd : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD) --zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) -+zstd$(EXT) : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP) -+zstd$(EXT) : LDFLAGS += $(THREAD_LD) $(DEBUGFLAGS_LD) -+zstd$(EXT) : LDLIBS += $(ZLIBLD) $(LZMALD) $(LZ4LD) -+zstd$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) - ifneq (,$(filter Windows%,$(OS))) --zstd : $(RES_FILE) -+zstd$(EXT) : $(RES_FILE) - endif - - ifndef BUILD_DIR - # generate BUILD_DIR from flags - --zstd: -+zstd$(EXT): - $(SET_CACHE_DIRECTORY) - - else - # BUILD_DIR is defined - - ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ)) --$(BUILD_DIR)/zstd : $(ZSTD_OBJ) -+$(BUILD_DIR)/zstd$(EXT) : $(ZSTD_OBJ) - @echo "$(THREAD_MSG)" - @echo "$(ZLIB_MSG)" - @echo "$(LZMA_MSG)" - @echo "$(LZ4_MSG)" - @echo LINK $@ -- $(CC) $(FLAGS) $^ $(LDLIBS) -o $@$(EXT) -+ $(CC) $(FLAGS) $^ $(LDLIBS) -o $@ - - ifeq ($(HAVE_HASH),1) - SRCBIN_HASH = $(shell cat $(BUILD_DIR)/zstd 2> $(VOID) | $(HASH) | cut -f 1 -d " ") -@@ -249,7 +249,7 @@ else - BIN_ISDIFFERENT = 1 - endif - --zstd : $(BUILD_DIR)/zstd -+zstd$(EXT) : $(BUILD_DIR)/zstd$(EXT) - if [ $(BIN_ISDIFFERENT) -eq 1 ]; then \ - cp -f $< $@; \ - echo zstd build completed; \ -@@ -263,46 +263,46 @@ endif # BUILD_DIR - .PHONY: zstd-release - zstd-release: DEBUGFLAGS := -DBACKTRACE_ENABLE=0 - zstd-release: DEBUGFLAGS_LD := --zstd-release: zstd -+zstd-release: zstd$(EXT) - --zstd32 : CPPFLAGS += $(THREAD_CPP) --zstd32 : LDFLAGS += $(THREAD_LD) --zstd32 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) -+zstd32$(EXT) : CPPFLAGS += $(THREAD_CPP) -+zstd32$(EXT) : LDFLAGS += $(THREAD_LD) -+zstd32$(EXT) : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) - ifneq (,$(filter Windows%,$(OS))) --zstd32 : $(RES32_FILE) -+zstd32$(EXT) : $(RES32_FILE) - endif --zstd32 : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC) -- $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) -+zstd32$(EXT) : $(ZSTDLIB_FULL_SRC) $(ZSTD_CLI_SRC) -+ $(CC) -m32 $(FLAGS) $^ -o $@ - - ## zstd-nolegacy: same scope as zstd, with just support of legacy formats removed --zstd-nolegacy : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) $(DEBUGFLAGS_LD) --zstd-nolegacy : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ) -- $(CC) $(FLAGS) $^ -o $@$(EXT) $(LDFLAGS) -+zstd-nolegacy$(EXT) : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) $(DEBUGFLAGS_LD) -+zstd-nolegacy$(EXT) : $(ZSTDLIB_CORE_SRC) $(ZDICT_SRC) $(ZSTD_CLI_OBJ) -+ $(CC) $(FLAGS) $^ -o $@ $(LDFLAGS) - - .PHONY: zstd-nomt - zstd-nomt : THREAD_CPP := - zstd-nomt : THREAD_LD := - zstd-nomt : THREAD_MSG := - multi-threading disabled --zstd-nomt : zstd -+zstd-nomt : zstd$(EXT) - - .PHONY: zstd-nogz - zstd-nogz : ZLIBCPP := - zstd-nogz : ZLIBLD := - zstd-nogz : ZLIB_MSG := - gzip support is disabled --zstd-nogz : zstd -+zstd-nogz : zstd$(EXT) - - .PHONY: zstd-noxz - zstd-noxz : LZMACPP := - zstd-noxz : LZMALD := - zstd-noxz : LZMA_MSG := - xz/lzma support is disabled --zstd-noxz : zstd -+zstd-noxz : zstd$(EXT) - - ## zstd-dll: zstd executable linked to dynamic library libzstd (must have same version) - .PHONY: zstd-dll - zstd-dll : LDFLAGS+= -L$(ZSTDDIR) - zstd-dll : LDLIBS += -lzstd - zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c --zstd-dll : zstd -+zstd-dll : zstd$(EXT) - - - ## zstd-pgo: zstd executable optimized with PGO. -@@ -321,23 +321,23 @@ zstd-pgo : - $(MAKE) zstd MOREFLAGS=-fprofile-use - - ## zstd-small: minimal target, supporting only zstd compression and decompression. no bench. no legacy. no other format. --zstd-small: CFLAGS = -Os -s --zstd-frugal zstd-small: $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c fileio.c -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o $@$(EXT) -+zstd-small$(EXT): CFLAGS = -Os -s -+zstd-frugal$(EXT) zstd-small$(EXT): $(ZSTDLIB_CORE_SRC) zstdcli.c util.c timefn.c fileio.c -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOTRACE $^ -o $@ - --zstd-decompress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) zstdcli.c util.c timefn.c fileio.c -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS -DZSTD_NOTRACE $^ -o $@$(EXT) -+zstd-decompress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_DECOMPRESS_C) zstdcli.c util.c timefn.c fileio.c -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NOCOMPRESS -DZSTD_NOTRACE $^ -o $@ - --zstd-compress: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c util.c timefn.c fileio.c -- $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@$(EXT) -+zstd-compress$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) zstdcli.c util.c timefn.c fileio.c -+ $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_NODECOMPRESS -DZSTD_NOTRACE $^ -o $@ - - ## zstd-dictBuilder: executable supporting dictionary creation and compression (only) --zstd-dictBuilder: CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS -DZSTD_NOTRACE --zstd-dictBuilder: $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c -- $(CC) $(FLAGS) $^ -o $@$(EXT) -+zstd-dictBuilder$(EXT): CPPFLAGS += -DZSTD_NOBENCH -DZSTD_NODECOMPRESS -DZSTD_NOTRACE -+zstd-dictBuilder$(EXT): $(ZSTDLIB_COMMON_C) $(ZSTDLIB_COMPRESS_C) $(ZDICT_SRC) zstdcli.c util.c timefn.c fileio.c dibio.c -+ $(CC) $(FLAGS) $^ -o $@ - --zstdmt: zstd -- ln -sf zstd zstdmt -+zstdmt$(EXT): zstd$(EXT) -+ ln -sf zstd$(EXT) zstdmt$(EXT) - - .PHONY: generate_res - generate_res: $(RES64_FILE) $(RES32_FILE) --- -2.31.1 - diff --git a/meta/recipes-extended/zstd/zstd_1.5.0.bb b/meta/recipes-extended/zstd/zstd_1.5.2.bb similarity index 86% rename from meta/recipes-extended/zstd/zstd_1.5.0.bb rename to meta/recipes-extended/zstd/zstd_1.5.2.bb index 51305d0562..71f439ef57 100644 --- a/meta/recipes-extended/zstd/zstd_1.5.0.bb +++ b/meta/recipes-extended/zstd/zstd_1.5.2.bb @@ -9,12 +9,9 @@ LICENSE = "BSD-3-Clause & GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" -SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https \ - file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \ - file://0001-MinGW-Build-Fixes.patch \ - " +SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https" -SRCREV = "a488ba114ec17ea1054b9057c26a046fc122b3b6" +SRCREV = "e47e674cd09583ff0503f0f6defd6d23d8b718d3" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" CVE_PRODUCT = "zstandard"
Drop patches merged upstream. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- ...rt-all-wildcard-file-list-expansions.patch | 81 -------- .../zstd/zstd/0001-MinGW-Build-Fixes.patch | 193 ------------------ .../zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb} | 7 +- 3 files changed, 2 insertions(+), 279 deletions(-) delete mode 100644 meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch delete mode 100644 meta/recipes-extended/zstd/zstd/0001-MinGW-Build-Fixes.patch rename meta/recipes-extended/zstd/{zstd_1.5.0.bb => zstd_1.5.2.bb} (86%)