diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb (renamed from meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.0.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch | 21 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb (renamed from meta-openembedded/meta-oe/recipes-extended/redis/redis_5.0.9.bb) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch | 27 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb (renamed from meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb) | 6 |
5 files changed, 47 insertions, 13 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb index e7cb6a06d..1a9cd8f10 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb @@ -15,4 +15,4 @@ inherit cmake SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" -SRC_URI[sha256sum] = "d26b2952426d2518f3db5cdeda4fe3cd668fc5bb38a598781e4d1d3f7f8ca7be" +SRC_URI[sha256sum] = "a020dc1b17a79faa748e43a05f8605d65e403813e8e97ad3a300a90ddba097ac" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch index 421f306de..878cd3697 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch @@ -11,20 +11,25 @@ Signed-off-by: Venture Research <tech@ventureresearch.com> Update to work with 4.0.8 Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Reworked for 6.0.4 +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- - deps/hiredis/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + deps/hiredis/Makefile | 2 -- + 1 file changed, 2 deletions(-) diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile -index 9a4de836..271c06ba 100644 +index 25ac154..569f82b 100644 --- a/deps/hiredis/Makefile +++ b/deps/hiredis/Makefile -@@ -36,7 +36,7 @@ endef +@@ -42,8 +42,6 @@ endef export REDIS_TEST_CONFIG # Fallback to gcc when $CC is not in $PATH. --CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') -+CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') - CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++') +-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') +-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') OPTIMIZATION?=-O3 - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings + WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers + DEBUG_FLAGS?= -g -ggdb +-- +2.21.3 + diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_5.0.9.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb index d04293369..ffa28ccfe 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_5.0.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.4.bb @@ -17,8 +17,8 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE.patch \ " -SRC_URI[md5sum] = "c94523c9f4ee662027ddf90575d0e058" -SRC_URI[sha256sum] = "53d0ae164cd33536c3d4b720ae9a128ea6166ebf04ff1add3b85f1242090cb85" +SRC_URI[md5sum] = "37200b25c282f94da4521bc510d79ced" +SRC_URI[sha256sum] = "3337005a1e0c3aa293c87c313467ea8ac11984921fab08807998ba765c9943de" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd/0001-Fix-legacy-build-after-2103.patch new file mode 100644 index 000000000..c701554b8 --- /dev/null +++ b/meta-openembedded/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 <orivej@gmx.fr> +Date: Fri, 22 May 2020 12:48:02 +0000 +Subject: [PATCH] Fix legacy build after #2103 + +Upstream-Status: Backport +Signed-of-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + 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-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.5.bb index eb201f413..cd0b471e1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.4.bb +++ b/meta-openembedded/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" |