From: Alex Kiernan <[email protected]> Signed-off-by: Alex Kiernan <[email protected]> Signed-off-by: Khem Raj <[email protected]> (cherry picked from commit f6aa84fcf197bb74ed2a4dc1e3bb898fc884e27b) Signed-off-by: Armin Kuster <[email protected]> --- .../0001-Fix-legacy-build-after-2103.patch | 27 +++++++++++++++++++ .../zstd/{zstd_1.4.4.bb => zstd_1.4.5.bb} | 6 +++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch rename meta-oe/recipes-extended/zstd/{zstd_1.4.4.bb => zstd_1.4.5.bb} (85%)
diff --git a/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch b/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch new file mode 100644 index 0000000000..c701554b8b --- /dev/null +++ b/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch @@ -0,0 +1,27 @@ +From 93cec0c1d6d0be8dd3a9d01d3e7f2099f1728df7 Mon Sep 17 00:00:00 2001 +From: Orivej Desh <[email protected]> +Date: Fri, 22 May 2020 12:48:02 +0000 +Subject: [PATCH] Fix legacy build after #2103 + +Upstream-Status: Backport +Signed-of-by: Alex Kiernan <[email protected]> +--- + lib/legacy/zstd_v04.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/legacy/zstd_v04.c b/lib/legacy/zstd_v04.c +index 56bf45222498..19fda8980abf 100644 +--- a/lib/legacy/zstd_v04.c ++++ b/lib/legacy/zstd_v04.c +@@ -74,7 +74,7 @@ extern "C" { + /*-************************************* + * Debug + ***************************************/ +-#include "debug.h" ++#include "../common/debug.h" + #ifndef assert + # define assert(condition) ((void)0) + #endif +-- +2.17.1 + diff --git a/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb b/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb similarity index 85% rename from meta-oe/recipes-extended/zstd/zstd_1.4.4.bb rename to meta-oe/recipes-extended/zstd/zstd_1.4.5.bb index eb201f4139..cd0b471e17 100644 --- a/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb +++ b/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb @@ -9,9 +9,11 @@ LICENSE = "BSD-3-Clause & GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" -SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" +SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1 \ + file://0001-Fix-legacy-build-after-2103.patch \ + " -SRCREV = "10f0e6993f9d2f682da6d04aa2385b7d53cbb4ee" +SRCREV = "b706286adbba780006a47ef92df0ad7a785666b6" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#85520): https://lists.openembedded.org/g/openembedded-devel/message/85520 Mute This Topic: https://lists.openembedded.org/mt/75225766/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
