zstd: upgrade 1.5.5 -> 1.5.6

Drop patch that was merged upstream.

(From OE-Core rev: eeed9f6a8e83eb29da8cb69a25dd690712e3ac1b)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-05-27 20:12:07 +02:00
committed by Richard Purdie
parent 0cb8e7cfc2
commit 79f67e4b8f
2 changed files with 2 additions and 42 deletions

View File

@@ -1,39 +0,0 @@
From 121ef5253a49065dea6a89536ca7bd3dabd40e25 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Mon, 19 Jun 2023 17:10:09 +0200
Subject: [PATCH] pzstd: use c++14 without conditions
Doing this check with a direct c++ snippet is prone to portability problems:
- \043 is not portable between shells: dash expands it to #,
bash does not;
- using # directly works with make 4.3 but does not with make 4.2.
Let's just use the c++ version that covers both the code and the gtest.
Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/3682]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
contrib/pzstd/Makefile | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile
index e62f8e87..58fb82a1 100644
--- a/contrib/pzstd/Makefile
+++ b/contrib/pzstd/Makefile
@@ -37,11 +37,8 @@ CFLAGS += -Wno-deprecated-declarations
PZSTD_INC = -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(PROGDIR) -I.
GTEST_INC = -isystem googletest/googletest/include
-# If default C++ version is older than C++11, explicitly set C++11, which is the
-# minimum required by the code.
-ifeq ($(shell echo "\043if __cplusplus < 201103L\n\043error\n\043endif" | $(CXX) -x c++ -Werror -c - -o /dev/null 2>/dev/null && echo 1 || echo 0),0)
-PZSTD_CXX_STD := -std=c++11
-endif
+# Set the minimum required by gtest
+PZSTD_CXX_STD := -std=c++14
PZSTD_CPPFLAGS = $(PZSTD_INC)
PZSTD_CCXXFLAGS =

View File

@@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \
file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0 \
"
SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https \
file://0001-pzstd-use-directly-for-the-test-c-snippet.patch"
SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https"
SRCREV = "63779c798237346c2b245c546c40b72a5a5913fe"
SRCREV = "794ea1b0afca0f020f4e57b6732332231fb23c70"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
CVE_PRODUCT = "zstandard"