summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-31 17:52:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:31 +0100
commitea5cf25579e72cbf523ac680db613a4944d7bb1a (patch)
treeda1530d88f1c7d441df06420b85ce284522aa4fa
parent94c710cf1139d8fb98598d91b8d6fad82f21aaf8 (diff)
downloadpoky-ea5cf25579e72cbf523ac680db613a4944d7bb1a.tar.gz
libcpre2: update 10.34 -> 10.35
Replace pcre-cross.patch with the (default) option to use pre-built tables; the README says it's ok, and recommended in cross-compile situations. The option was in the recipe from the start and neither the commit that adds the recipe, nor the patch to make it work explain why. License-Update: copyright years (From OE-Core rev: df85581e8ac01183b13dd7c3e926ee93f50214f2) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libpcre/libpcre2/pcre-cross.patch65
-rw-r--r--meta/recipes-support/libpcre/libpcre2_10.35.bb (renamed from meta/recipes-support/libpcre/libpcre2_10.34.bb)15
2 files changed, 3 insertions, 77 deletions
diff --git a/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch b/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch
deleted file mode 100644
index 871cdfcb7d..0000000000
--- a/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1Fix for cross compiling
2
3Fixed:
4| ./dftables src/pcre2_chartables.c
5| make: ./dftables: Command not found
6| make: *** [src/pcre2_chartables.c] Error 127
7
8Upstream-Status: Pending
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11
12Index: pcre2-10.30/Makefile.am
13===================================================================
14--- pcre2-10.30.orig/Makefile.am
15+++ pcre2-10.30/Makefile.am
16@@ -325,9 +325,21 @@ bin_SCRIPTS = pcre2-config
17 ## to copy a distributed set of tables that are defined for ASCII code. In this
18 ## case, dftables is not needed.
19
20+CC_FOR_BUILD = @CC_FOR_BUILD@
21+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
22+CCLD_FOR_BUILD = @CCLD_FOR_BUILD@
23+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
24+
25 if WITH_REBUILD_CHARTABLES
26 noinst_PROGRAMS += dftables
27 dftables_SOURCES = src/dftables.c
28+
29+dftables_LINK = $(CCLD_FOR_BUILD) -o $@
30+dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD)
31+
32+src/dftables.o: $(srcdir)/src/dftables.c
33+ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/src/dftables.c
34+
35 src/pcre2_chartables.c: dftables$(EXEEXT)
36 rm -f $@
37 ./dftables$(EXEEXT) $@
38Index: pcre2-10.30/configure.ac
39===================================================================
40--- pcre2-10.30.orig/configure.ac
41+++ pcre2-10.30/configure.ac
42@@ -60,6 +60,23 @@ fi
43 # This is a new thing required to stop a warning from automake 1.12
44 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
45
46+if test x"$cross_compiling" = xyes; then
47+ CC_FOR_BUILD="${CC_FOR_BUILD-gcc}"
48+ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-gcc}"
49+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}"
50+ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD}"
51+else
52+ CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}"
53+ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-\$(CCLD)}"
54+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-\$(CFLAGS)}"
55+ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD-\$(LDFLAGS)}"
56+fi
57+AC_ARG_VAR(CC_FOR_BUILD, [build system C compiler])
58+AC_ARG_VAR(CCLD_FOR_BUILD, [build system C linker frontend])
59+AC_ARG_VAR(CFLAGS_FOR_BUILD, [build system C compiler arguments])
60+AC_ARG_VAR(LDFLAGS_FOR_BUILD, [build system C linker frontend arguments])
61+
62+
63 # Check for a 64-bit integer type
64 AC_TYPE_INT64_T
65
diff --git a/meta/recipes-support/libpcre/libpcre2_10.34.bb b/meta/recipes-support/libpcre/libpcre2_10.35.bb
index fa8655e027..35c019c100 100644
--- a/meta/recipes-support/libpcre/libpcre2_10.34.bb
+++ b/meta/recipes-support/libpcre/libpcre2_10.35.bb
@@ -8,14 +8,11 @@ SUMMARY = "Perl Compatible Regular Expressions version 2"
8HOMEPAGE = "http://www.pcre.org" 8HOMEPAGE = "http://www.pcre.org"
9SECTION = "devel" 9SECTION = "devel"
10LICENSE = "BSD-3-Clause" 10LICENSE = "BSD-3-Clause"
11LIC_FILES_CHKSUM = "file://LICENCE;md5=b1588d3bb4cb0e1f5a597d908f8c5b37" 11LIC_FILES_CHKSUM = "file://LICENCE;md5=a06590e9bd4c229532364727aaeaf084"
12 12
13SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ 13SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2"
14 file://pcre-cross.patch \
15"
16 14
17SRC_URI[md5sum] = "d280b62ded13f9ccf2fac16ee5286366" 15SRC_URI[sha256sum] = "9ccba8e02b0ce78046cdfb52e5c177f0f445e421059e43becca4359c669d4613"
18SRC_URI[sha256sum] = "74c473ffaba9e13db6951fd146e0143fe9887852ce73406a03277af1d9b798ca"
19 16
20CVE_PRODUCT = "pcre2" 17CVE_PRODUCT = "pcre2"
21 18
@@ -30,20 +27,14 @@ inherit autotools binconfig-disabled
30 27
31EXTRA_OECONF = "\ 28EXTRA_OECONF = "\
32 --enable-newline-is-lf \ 29 --enable-newline-is-lf \
33 --enable-rebuild-chartables \
34 --with-link-size=2 \ 30 --with-link-size=2 \
35 --with-match-limit=10000000 \ 31 --with-match-limit=10000000 \
36 --enable-pcre2-16 \ 32 --enable-pcre2-16 \
37 --enable-pcre2-32 \ 33 --enable-pcre2-32 \
38" 34"
39# Set LINK_SIZE in BUILD_CFLAGS given that the autotools bbclass use it to
40# set CFLAGS_FOR_BUILD, required for the libpcre build.
41BUILD_CFLAGS =+ "-DLINK_SIZE=2 -I${B}/src"
42CFLAGS += "-D_REENTRANT" 35CFLAGS += "-D_REENTRANT"
43CXXFLAGS_append_powerpc = " -lstdc++" 36CXXFLAGS_append_powerpc = " -lstdc++"
44 37
45export CCLD_FOR_BUILD ="${BUILD_CCLD}"
46
47PACKAGES =+ "libpcre2-16 libpcre2-32 pcre2grep pcre2grep-doc pcre2test pcre2test-doc" 38PACKAGES =+ "libpcre2-16 libpcre2-32 pcre2grep pcre2grep-doc pcre2test pcre2test-doc"
48 39
49SUMMARY_pcre2grep = "grep utility that uses perl 5 compatible regexes" 40SUMMARY_pcre2grep = "grep utility that uses perl 5 compatible regexes"