summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-02-25 19:53:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-28 23:11:28 +0000
commit95dfc6f150164f59bd6c9b48d03d6751ce5975c1 (patch)
treeb8d9e981f5e66344a28d11c7a362877c55ae94bb /meta/recipes-support
parent9d716ccf476c7d2c11e180d5ef85ae8209fb2f49 (diff)
downloadpoky-95dfc6f150164f59bd6c9b48d03d6751ce5975c1.tar.gz
libpcre: upgrade 8.43 -> 8.44
License-Update: copyright years (From OE-Core rev: 09f6639ed599f71a4ec58305b9d684ccc8983ba0) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libpcre/libpcre/out-of-tree.patch26
-rw-r--r--meta/recipes-support/libpcre/libpcre_8.44.bb (renamed from meta/recipes-support/libpcre/libpcre_8.43.bb)9
2 files changed, 4 insertions, 31 deletions
diff --git a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch b/meta/recipes-support/libpcre/libpcre/out-of-tree.patch
deleted file mode 100644
index d56789615f..0000000000
--- a/meta/recipes-support/libpcre/libpcre/out-of-tree.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1In out-of-tree builds the #include fails because $srcdir isn't in the include path. Set CPPFLAGS so that it is.
2
3Upstream-Status: Backport [r1750]
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6Index: configure.ac
7===================================================================
8--- a/configure.ac (revision 1749)
9+++ b/configure.ac (working copy)
10@@ -159,6 +159,8 @@
11
12 if test "$enable_jit" = "auto"; then
13 AC_LANG(C)
14+ SAVE_CPPFLAGS=$CPPFLAGS
15+ CPPFLAGS=-I$srcdir
16 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
17 #define SLJIT_CONFIG_AUTO 1
18 #include "sljit/sljitConfigInternal.h"
19@@ -165,6 +167,7 @@
20 #if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
21 #error unsupported
22 #endif]])], enable_jit=yes, enable_jit=no)
23+ CPPFLAGS=$SAVE_CPPFLAGS
24 fi
25
26 # Handle --disable-pcregrep-jit (enabled by default)
diff --git a/meta/recipes-support/libpcre/libpcre_8.43.bb b/meta/recipes-support/libpcre/libpcre_8.44.bb
index f9a22fee9d..e5471e81da 100644
--- a/meta/recipes-support/libpcre/libpcre_8.43.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.44.bb
@@ -6,16 +6,15 @@ SUMMARY = "Perl Compatible Regular Expressions"
6HOMEPAGE = "http://www.pcre.org" 6HOMEPAGE = "http://www.pcre.org"
7SECTION = "devel" 7SECTION = "devel"
8LICENSE = "BSD-3-Clause" 8LICENSE = "BSD-3-Clause"
9LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1" 9LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e"
10SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ 10SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \
11 file://fix-pcre-name-collision.patch \ 11 file://fix-pcre-name-collision.patch \
12 file://out-of-tree.patch \
13 file://run-ptest \ 12 file://run-ptest \
14 file://Makefile \ 13 file://Makefile \
15" 14 "
16 15
17SRC_URI[md5sum] = "636222e79e392c3d95dcc545f24f98c4" 16SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24"
18SRC_URI[sha256sum] = "91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b" 17SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d"
19 18
20CVE_PRODUCT = "pcre" 19CVE_PRODUCT = "pcre"
21 20