diff options
Diffstat (limited to 'poky/meta/recipes-support/libpcre')
-rw-r--r-- | poky/meta/recipes-support/libpcre/libpcre/out-of-tree.patch | 26 | ||||
-rw-r--r-- | poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch | 48 | ||||
-rw-r--r-- | poky/meta/recipes-support/libpcre/libpcre2_10.32.bb (renamed from poky/meta/recipes-support/libpcre/libpcre2_10.31.bb) | 6 | ||||
-rw-r--r-- | poky/meta/recipes-support/libpcre/libpcre_8.43.bb (renamed from poky/meta/recipes-support/libpcre/libpcre_8.42.bb) | 27 |
4 files changed, 36 insertions, 71 deletions
diff --git a/poky/meta/recipes-support/libpcre/libpcre/out-of-tree.patch b/poky/meta/recipes-support/libpcre/libpcre/out-of-tree.patch new file mode 100644 index 000000000..d56789615 --- /dev/null +++ b/poky/meta/recipes-support/libpcre/libpcre/out-of-tree.patch @@ -0,0 +1,26 @@ +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/poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch b/poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch deleted file mode 100644 index 83880f709..000000000 --- a/poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch +++ /dev/null @@ -1,48 +0,0 @@ -Upstream-Status: Pending - ---- pcre-8.32.orig/Makefile.am -+++ pcre-8.32/Makefile.am -@@ -197,8 +197,18 @@ bin_SCRIPTS = pcre-config - -+CC_FOR_BUILD = @CC_FOR_BUILD@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ -+CCLD_FOR_BUILD = @CCLD_FOR_BUILD@ -+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ -+ - if WITH_REBUILD_CHARTABLES - - noinst_PROGRAMS += dftables - dftables_SOURCES = dftables.c -+dftables_LINK = $(CCLD_FOR_BUILD) -o $@ -+dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD) -+ -+dftables.o: $(srcdir)/dftables.c -+ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/dftables.c - - pcre_chartables.c: dftables$(EXEEXT) - ./dftables$(EXEEXT) $@ ---- pcre-8.32.orig/configure.ac -+++ pcre-8.32/configure.ac -@@ -72,6 +72,22 @@ then - fi - fi - -+if test x"$cross_compiling" = xyes; then -+ CC_FOR_BUILD="${CC_FOR_BUILD-gcc}" -+ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-gcc}" -+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}" -+ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD}" -+else -+ CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}" -+ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-\$(CCLD)}" -+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-\$(CFLAGS)}" -+ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD-\$(LDFLAGS)}" -+fi -+AC_ARG_VAR(CC_FOR_BUILD, [build system C compiler]) -+AC_ARG_VAR(CCLD_FOR_BUILD, [build system C linker frontend]) -+AC_ARG_VAR(CFLAGS_FOR_BUILD, [build system C compiler arguments]) -+AC_ARG_VAR(LDFLAGS_FOR_BUILD, [build system C linker frontend arguments]) -+ - # AC_PROG_CXX will return "g++" even if no c++ compiler is installed. - # Check for that case, and just disable c++ code if g++ doesn't run. - AC_LANG_PUSH(C++) diff --git a/poky/meta/recipes-support/libpcre/libpcre2_10.31.bb b/poky/meta/recipes-support/libpcre/libpcre2_10.32.bb index a10c312e9..3a0aa5302 100644 --- a/poky/meta/recipes-support/libpcre/libpcre2_10.31.bb +++ b/poky/meta/recipes-support/libpcre/libpcre2_10.32.bb @@ -8,14 +8,14 @@ SUMMARY = "Perl Compatible Regular Expressions version 2" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=f5e4bde9fd0493d0967b4dba9899590f" +LIC_FILES_CHKSUM = "file://LICENCE;md5=cf66d307bf03bae65d413eb7a8e603a0" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ file://pcre-cross.patch \ " -SRC_URI[md5sum] = "e0b91c891a3c49050f7fd15de33d0ba4" -SRC_URI[sha256sum] = "e07d538704aa65e477b6a392b32ff9fc5edf75ab9a40ddfc876186c4ff4d68ac" +SRC_URI[md5sum] = "8a096287153fb994970df3570e90fcb5" +SRC_URI[sha256sum] = "f29e89cc5de813f45786580101aaee3984a65818631d4ddbda7b32f699b87c2e" CVE_PRODUCT = "pcre2" diff --git a/poky/meta/recipes-support/libpcre/libpcre_8.42.bb b/poky/meta/recipes-support/libpcre/libpcre_8.43.bb index 3a488c00b..08314efb9 100644 --- a/poky/meta/recipes-support/libpcre/libpcre_8.42.bb +++ b/poky/meta/recipes-support/libpcre/libpcre_8.43.bb @@ -6,16 +6,16 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=fc5026403b44c868c25fc9546f7feb05" +LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ - file://pcre-cross.patch \ file://fix-pcre-name-collision.patch \ + file://out-of-tree.patch \ file://run-ptest \ file://Makefile \ " -SRC_URI[md5sum] = "085b6aa253e0f91cae70b3cdbe8c1ac2" -SRC_URI[sha256sum] = "2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301" +SRC_URI[md5sum] = "636222e79e392c3d95dcc545f24f98c4" +SRC_URI[sha256sum] = "91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b" CVE_PRODUCT = "pcre" @@ -24,33 +24,20 @@ S = "${WORKDIR}/pcre-${PV}" PROVIDES += "pcre" DEPENDS += "bzip2 zlib" -PACKAGECONFIG ??= "pcre8 unicode-properties" +PACKAGECONFIG ??= "pcre8 unicode-properties jit" PACKAGECONFIG[pcre8] = "--enable-pcre8,--disable-pcre8" PACKAGECONFIG[pcre16] = "--enable-pcre16,--disable-pcre16" PACKAGECONFIG[pcre32] = "--enable-pcre32,--disable-pcre32" PACKAGECONFIG[pcretest-readline] = "--enable-pcretest-libreadline,--disable-pcretest-libreadline,readline," PACKAGECONFIG[unicode-properties] = "--enable-unicode-properties,--disable-unicode-properties" +PACKAGECONFIG[jit] = "--enable-jit=auto,--disable-jit" BINCONFIG = "${bindir}/pcre-config" inherit autotools binconfig-disabled ptest -EXTRA_OECONF = "\ - --enable-newline-is-lf \ - --enable-rebuild-chartables \ - --enable-utf \ - --with-link-size=2 \ - --with-match-limit=10000000 \ -" - -# Set LINK_SIZE in BUILD_CFLAGS given that the autotools bbclass use it to -# set CFLAGS_FOR_BUILD, required for the libpcre build. -BUILD_CFLAGS =+ "-DLINK_SIZE=2 -I${B}" -CFLAGS += "-D_REENTRANT" -CXXFLAGS_append_powerpc = " -lstdc++" - -export CCLD_FOR_BUILD ="${BUILD_CCLD}" +EXTRA_OECONF = "--enable-utf" PACKAGES =+ "libpcrecpp libpcreposix pcregrep pcregrep-doc pcretest pcretest-doc" |