diff options
Diffstat (limited to 'meta/recipes-support/xxhash')
-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.2.bb (renamed from meta/recipes-support/xxhash/xxhash_0.8.0.bb) | 14 |
2 files changed, 8 insertions, 61 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 @@ -From 9ab56f841b1986cd5cdff66cb5ef222794b9ed39 Mon Sep 17 00:00:00 2001 -From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> -Date: Mon, 22 Feb 2021 14:07:58 -0500 -Subject: [PATCH] Makefile: escape special regex characters in paths - -Fixes a problem with certain valid install paths: - -make prefix=/tmp/a+b/ -Makefile:434: *** configured libdir (/tmp/a+b//lib) is outside of exec_prefix (/tmp/a+b/), can't generate pkg-config file. Stop. - -Upstream-Status: Backport [f79cd22a806993b4a62d8a4f1ba529a29a9d9ff5] - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - Makefile | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index ef24e94..baa1533 100644 ---- a/Makefile -+++ b/Makefile -@@ -411,14 +411,18 @@ INSTALL_PROGRAM ?= $(INSTALL) - INSTALL_DATA ?= $(INSTALL) -m 644 - - --PCLIBDIR ?= $(shell echo "$(LIBDIR)" | $(SED) -n $(SED_ERE_OPT) -e "s@^$(EXEC_PREFIX)(/|$$)@@p") --PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | $(SED) -n $(SED_ERE_OPT) -e "s@^$(PREFIX)(/|$$)@@p") -+# Escape special symbols by putting each character into its separate class -+EXEC_PREFIX_REGEX ?= $(shell echo "$(EXEC_PREFIX)" | $(SED) $(SED_ERE_OPT) -e "s/([^^])/[\1]/g" -e "s/\\^/\\\\^/g") -+PREFIX_REGEX ?= $(shell echo "$(PREFIX)" | $(SED) $(SED_ERE_OPT) -e "s/([^^])/[\1]/g" -e "s/\\^/\\\\^/g") -+ -+PCLIBDIR ?= $(shell echo "$(LIBDIR)" | $(SED) -n $(SED_ERE_OPT) -e "s@^$(EXEC_PREFIX_REGEX)(/|$$)@@p") -+PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | $(SED) -n $(SED_ERE_OPT) -e "s@^$(PREFIX_REGEX)(/|$$)@@p") - PCEXECDIR?= $(if $(filter $(PREFIX),$(EXEC_PREFIX)),$$\{prefix\},$(EXEC_PREFIX)) - - ifeq (,$(PCLIBDIR)) - # Additional prefix check is required, since the empty string is technically a - # valid PCLIBDIR --ifeq (,$(shell echo "$(LIBDIR)" | $(SED) -n $(SED_ERE_OPT) -e "\\@^$(EXEC_PREFIX)(/|$$)@ p")) -+ifeq (,$(shell echo "$(LIBDIR)" | $(SED) -n $(SED_ERE_OPT) -e "\\@^$(EXEC_PREFIX_REGEX)(/|$$)@ p")) - $(error configured libdir ($(LIBDIR)) is outside of exec_prefix ($(EXEC_PREFIX)), can't generate pkg-config file) - endif - endif -@@ -426,7 +430,7 @@ endif - ifeq (,$(PCINCDIR)) - # Additional prefix check is required, since the empty string is technically a - # valid PCINCDIR --ifeq (,$(shell echo "$(INCLUDEDIR)" | $(SED) -n $(SED_ERE_OPT) -e "\\@^$(PREFIX)(/|$$)@ p")) -+ifeq (,$(shell echo "$(INCLUDEDIR)" | $(SED) -n $(SED_ERE_OPT) -e "\\@^$(PREFIX_REGEX)(/|$$)@ p")) - $(error configured includedir ($(INCLUDEDIR)) is outside of prefix ($(PREFIX)), can't generate pkg-config file) - endif - endif --- -2.17.1 - diff --git a/meta/recipes-support/xxhash/xxhash_0.8.0.bb b/meta/recipes-support/xxhash/xxhash_0.8.2.bb index 4e48365a71..f16b183c95 100644 --- a/meta/recipes-support/xxhash/xxhash_0.8.0.bb +++ b/meta/recipes-support/xxhash/xxhash_0.8.2.bb @@ -2,18 +2,20 @@ SUMMARY = "Extremely fast non-cryptographic hash algorithm" DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \ working at speeds close to RAM limits." HOMEPAGE = "http://www.xxhash.com/" -LICENSE = "BSD-2-Clause & GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b335320506abb0505437e39295e799cb" +LICENSE = "BSD-2-Clause & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=13be6b481ff5616f77dda971191bb29b \ + file://cli/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + " -SRC_URI = "git://github.com/Cyan4973/xxHash.git;branch=release;protocol=git \ - file://0001-Makefile-escape-special-regex-characters-in-paths.patch \ - " +SRC_URI = "git://github.com/Cyan4973/xxHash.git;branch=release;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" -SRCREV = "94e5f23e736f2bb67ebdf90727353e65344f9fc0" +SRCREV = "bbb27a5efb85b92a0486cf361a8635715a53f6ba" S = "${WORKDIR}/git" +CFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}" + do_compile () { oe_runmake all } |