diff options
-rw-r--r-- | meta/recipes-support/libpcre/libpcre/out-of-tree.patch | 26 | ||||
-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 @@ -In out-of-tree builds the #include fails because $srcdir isn't in the include path. Set CPPFLAGS so that it is. - -Upstream-Status: Backport [r1750] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -Index: configure.ac -=================================================================== ---- a/configure.ac (revision 1749) -+++ b/configure.ac (working copy) -@@ -159,6 +159,8 @@ - - if test "$enable_jit" = "auto"; then - AC_LANG(C) -+ SAVE_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$srcdir - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #define SLJIT_CONFIG_AUTO 1 - #include "sljit/sljitConfigInternal.h" -@@ -165,6 +167,7 @@ - #if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) - #error unsupported - #endif]])], enable_jit=yes, enable_jit=no) -+ CPPFLAGS=$SAVE_CPPFLAGS - fi - - # 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" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1" +LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://fix-pcre-name-collision.patch \ - file://out-of-tree.patch \ file://run-ptest \ file://Makefile \ -" + " -SRC_URI[md5sum] = "636222e79e392c3d95dcc545f24f98c4" -SRC_URI[sha256sum] = "91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b" +SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24" +SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" CVE_PRODUCT = "pcre" |