From 79f67e4b8f300964d6793b6ad5f34f84dbabe5ef Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 27 May 2024 20:12:07 +0200 Subject: zstd: upgrade 1.5.5 -> 1.5.6 Drop patch that was merged upstream. (From OE-Core rev: eeed9f6a8e83eb29da8cb69a25dd690712e3ac1b) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...pzstd-use-directly-for-the-test-c-snippet.patch | 39 ------------------ meta/recipes-extended/zstd/zstd_1.5.5.bb | 47 ---------------------- meta/recipes-extended/zstd/zstd_1.5.6.bb | 46 +++++++++++++++++++++ 3 files changed, 46 insertions(+), 86 deletions(-) delete mode 100644 meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch delete mode 100644 meta/recipes-extended/zstd/zstd_1.5.5.bb create mode 100644 meta/recipes-extended/zstd/zstd_1.5.6.bb diff --git a/meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch b/meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch deleted file mode 100644 index 847a641691..0000000000 --- a/meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 121ef5253a49065dea6a89536ca7bd3dabd40e25 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -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 - ---- - 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 = diff --git a/meta/recipes-extended/zstd/zstd_1.5.5.bb b/meta/recipes-extended/zstd/zstd_1.5.5.bb deleted file mode 100644 index 2d72af50a4..0000000000 --- a/meta/recipes-extended/zstd/zstd_1.5.5.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Zstandard - Fast real-time compression algorithm" -DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ -real-time compression scenarios at zlib-level and better compression ratios. \ -It's backed by a very fast entropy stage, provided by Huff0 and FSE library." -HOMEPAGE = "http://www.zstd.net/" -SECTION = "console/utils" - -LICENSE = "BSD-3-Clause | GPL-2.0-only" -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" - -SRCREV = "63779c798237346c2b245c546c40b72a5a5913fe" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" - -CVE_PRODUCT = "zstandard" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" -PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" -PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" - -# See programs/README.md for how to use this -ZSTD_LEGACY_SUPPORT ??= "4" - -EXTRA_OEMAKE += "V=1" - -do_compile () { - oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} - oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} -C contrib/pzstd -} - -do_install () { - oe_runmake install 'DESTDIR=${D}' - oe_runmake install 'DESTDIR=${D}' PREFIX=${prefix} -C contrib/pzstd -} - -PACKAGE_BEFORE_PN = "libzstd" - -FILES:libzstd = "${libdir}/libzstd${SOLIBS}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/zstd/zstd_1.5.6.bb b/meta/recipes-extended/zstd/zstd_1.5.6.bb new file mode 100644 index 0000000000..0f3309d8af --- /dev/null +++ b/meta/recipes-extended/zstd/zstd_1.5.6.bb @@ -0,0 +1,46 @@ +SUMMARY = "Zstandard - Fast real-time compression algorithm" +DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ +real-time compression scenarios at zlib-level and better compression ratios. \ +It's backed by a very fast entropy stage, provided by Huff0 and FSE library." +HOMEPAGE = "http://www.zstd.net/" +SECTION = "console/utils" + +LICENSE = "BSD-3-Clause | GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \ + file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0 \ + " + +SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https" + +SRCREV = "794ea1b0afca0f020f4e57b6732332231fb23c70" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +CVE_PRODUCT = "zstandard" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" +PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" +PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" + +# See programs/README.md for how to use this +ZSTD_LEGACY_SUPPORT ??= "4" + +EXTRA_OEMAKE += "V=1" + +do_compile () { + oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} + oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} -C contrib/pzstd +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' + oe_runmake install 'DESTDIR=${D}' PREFIX=${prefix} -C contrib/pzstd +} + +PACKAGE_BEFORE_PN = "libzstd" + +FILES:libzstd = "${libdir}/libzstd${SOLIBS}" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf