diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-12-08 22:59:45 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-09 10:33:26 +0000 |
commit | a16a5e3d388f92a06cb9b1519f082a9e8feb6cbf (patch) | |
tree | 2751feba85b18854a4f637bf9c5d8871ed34f7c8 /meta | |
parent | d0a4ea90b439c9239cee51f1f7463da80601aa30 (diff) | |
download | poky-a16a5e3d388f92a06cb9b1519f082a9e8feb6cbf.tar.gz |
xxhash: upgrade 0.8.0 -> 0.8.1
License-Update: GPL2 license for cli tool moved to a separate file
(From OE-Core rev: 706ed171c0b761a01f01baac92a2f2ad9ba8240b)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/xxhash/files/0001-Makefile-escape-special-regex-characters-in-paths.patch | 55 | ||||
-rw-r--r-- | meta/recipes-support/xxhash/xxhash_0.8.1.bb (renamed from meta/recipes-support/xxhash/xxhash_0.8.0.bb) | 10 |
2 files changed, 5 insertions, 60 deletions
diff --git a/meta/recipes-support/xxhash/files/0001-Makefile-escape-special-regex-characters-in-paths.patch b/meta/recipes-support/xxhash/files/0001-Makefile-escape-special-regex-characters-in-paths.patch deleted file mode 100644 index 6d3da147f2..0000000000 --- a/meta/recipes-support/xxhash/files/0001-Makefile-escape-special-regex-characters-in-paths.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From 9ab56f841b1986cd5cdff66cb5ef222794b9ed39 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | ||
3 | Date: Mon, 22 Feb 2021 14:07:58 -0500 | ||
4 | Subject: [PATCH] Makefile: escape special regex characters in paths | ||
5 | |||
6 | Fixes a problem with certain valid install paths: | ||
7 | |||
8 | make prefix=/tmp/a+b/ | ||
9 | Makefile:434: *** configured libdir (/tmp/a+b//lib) is outside of exec_prefix (/tmp/a+b/), can't generate pkg-config file. Stop. | ||
10 | |||
11 | Upstream-Status: Backport [f79cd22a806993b4a62d8a4f1ba529a29a9d9ff5] | ||
12 | |||
13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
14 | --- | ||
15 | Makefile | 12 ++++++++---- | ||
16 | 1 file changed, 8 insertions(+), 4 deletions(-) | ||
17 | |||
18 | diff --git a/Makefile b/Makefile | ||
19 | index ef24e94..baa1533 100644 | ||
20 | --- a/Makefile | ||
21 | +++ b/Makefile | ||
22 | @@ -411,14 +411,18 @@ INSTALL_PROGRAM ?= $(INSTALL) | ||
23 | INSTALL_DATA ?= $(INSTALL) -m 644 | ||
24 | |||
25 | |||
26 | -PCLIBDIR ?= $(shell echo "$(LIBDIR)" | $(SED) -n $(SED_ERE_OPT) -e "s@^$(EXEC_PREFIX)(/|$$)@@p") | ||
27 | -PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | $(SED) -n $(SED_ERE_OPT) -e "s@^$(PREFIX)(/|$$)@@p") | ||
28 | +# Escape special symbols by putting each character into its separate class | ||
29 | +EXEC_PREFIX_REGEX ?= $(shell echo "$(EXEC_PREFIX)" | $(SED) $(SED_ERE_OPT) -e "s/([^^])/[\1]/g" -e "s/\\^/\\\\^/g") | ||
30 | +PREFIX_REGEX ?= $(shell echo "$(PREFIX)" | $(SED) $(SED_ERE_OPT) -e "s/([^^])/[\1]/g" -e "s/\\^/\\\\^/g") | ||
31 | + | ||
32 | +PCLIBDIR ?= $(shell echo "$(LIBDIR)" | $(SED) -n $(SED_ERE_OPT) -e "s@^$(EXEC_PREFIX_REGEX)(/|$$)@@p") | ||
33 | +PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | $(SED) -n $(SED_ERE_OPT) -e "s@^$(PREFIX_REGEX)(/|$$)@@p") | ||
34 | PCEXECDIR?= $(if $(filter $(PREFIX),$(EXEC_PREFIX)),$$\{prefix\},$(EXEC_PREFIX)) | ||
35 | |||
36 | ifeq (,$(PCLIBDIR)) | ||
37 | # Additional prefix check is required, since the empty string is technically a | ||
38 | # valid PCLIBDIR | ||
39 | -ifeq (,$(shell echo "$(LIBDIR)" | $(SED) -n $(SED_ERE_OPT) -e "\\@^$(EXEC_PREFIX)(/|$$)@ p")) | ||
40 | +ifeq (,$(shell echo "$(LIBDIR)" | $(SED) -n $(SED_ERE_OPT) -e "\\@^$(EXEC_PREFIX_REGEX)(/|$$)@ p")) | ||
41 | $(error configured libdir ($(LIBDIR)) is outside of exec_prefix ($(EXEC_PREFIX)), can't generate pkg-config file) | ||
42 | endif | ||
43 | endif | ||
44 | @@ -426,7 +430,7 @@ endif | ||
45 | ifeq (,$(PCINCDIR)) | ||
46 | # Additional prefix check is required, since the empty string is technically a | ||
47 | # valid PCINCDIR | ||
48 | -ifeq (,$(shell echo "$(INCLUDEDIR)" | $(SED) -n $(SED_ERE_OPT) -e "\\@^$(PREFIX)(/|$$)@ p")) | ||
49 | +ifeq (,$(shell echo "$(INCLUDEDIR)" | $(SED) -n $(SED_ERE_OPT) -e "\\@^$(PREFIX_REGEX)(/|$$)@ p")) | ||
50 | $(error configured includedir ($(INCLUDEDIR)) is outside of prefix ($(PREFIX)), can't generate pkg-config file) | ||
51 | endif | ||
52 | endif | ||
53 | -- | ||
54 | 2.17.1 | ||
55 | |||
diff --git a/meta/recipes-support/xxhash/xxhash_0.8.0.bb b/meta/recipes-support/xxhash/xxhash_0.8.1.bb index 686fbea591..ec559a8759 100644 --- a/meta/recipes-support/xxhash/xxhash_0.8.0.bb +++ b/meta/recipes-support/xxhash/xxhash_0.8.1.bb | |||
@@ -3,14 +3,14 @@ DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \ | |||
3 | working at speeds close to RAM limits." | 3 | working at speeds close to RAM limits." |
4 | HOMEPAGE = "http://www.xxhash.com/" | 4 | HOMEPAGE = "http://www.xxhash.com/" |
5 | LICENSE = "BSD-2-Clause & GPL-2.0" | 5 | LICENSE = "BSD-2-Clause & GPL-2.0" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b335320506abb0505437e39295e799cb" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=cdfe7764d5685d8e08b3df302885d7f3 \ |
7 | file://cli/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
8 | " | ||
7 | 9 | ||
8 | SRC_URI = "git://github.com/Cyan4973/xxHash.git;branch=release;protocol=https \ | 10 | SRC_URI = "git://github.com/Cyan4973/xxHash.git;branch=release;protocol=https" |
9 | file://0001-Makefile-escape-special-regex-characters-in-paths.patch \ | ||
10 | " | ||
11 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | 11 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" |
12 | 12 | ||
13 | SRCREV = "94e5f23e736f2bb67ebdf90727353e65344f9fc0" | 13 | SRCREV = "35b0373c697b5f160d3db26b1cbb45a0d5ba788c" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||