summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-02-27 18:33:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-28 17:47:10 +0000
commit263470b20e709b8ea1a446af9f022699971c7fff (patch)
tree8234a6df9b2cd3e39936f32dccb22f62978cfa12
parent598280697ce50ef5cbf38e78a66c304b4b7641ec (diff)
downloadpoky-263470b20e709b8ea1a446af9f022699971c7fff.tar.gz
libpcre: recipe cleanup
The following options are the defaults, so remove them: --enable-newline-is-lf --with-match-size=2 --with-match-limit=10000000 We don't appear to need to pass -D_REENTRANT anymore (added with no explanation to oe-classic in 2006). Explicitly adding -lstdc++ doesn't appear to be required anymore (added for PowerPC in 2008). This recipe has always rebuilt the character tables but back in PCRE 4.4 (first added to OE) a copy of the tables wasn't distributed with the tarball so this was required. Since 2007 the tarball includes the tables for ASCII and regeneration is only required if we wish to use EBCDIC, which we do not. Drop the patch adding CC_FOR_BUILD support and remove --enable-rebuild-chartables (From OE-Core rev: ba84fbf2e59cdaae203b013125817155cb5aa41f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libpcre/libpcre/pcre-cross.patch48
-rw-r--r--meta/recipes-support/libpcre/libpcre_8.43.bb17
2 files changed, 1 insertions, 64 deletions
diff --git a/meta/recipes-support/libpcre/libpcre/pcre-cross.patch b/meta/recipes-support/libpcre/libpcre/pcre-cross.patch
deleted file mode 100644
index 83880f7098..0000000000
--- a/meta/recipes-support/libpcre/libpcre/pcre-cross.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1Upstream-Status: Pending
2
3--- pcre-8.32.orig/Makefile.am
4+++ pcre-8.32/Makefile.am
5@@ -197,8 +197,18 @@ bin_SCRIPTS = pcre-config
6
7+CC_FOR_BUILD = @CC_FOR_BUILD@
8+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
9+CCLD_FOR_BUILD = @CCLD_FOR_BUILD@
10+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
11+
12 if WITH_REBUILD_CHARTABLES
13
14 noinst_PROGRAMS += dftables
15 dftables_SOURCES = dftables.c
16+dftables_LINK = $(CCLD_FOR_BUILD) -o $@
17+dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD)
18+
19+dftables.o: $(srcdir)/dftables.c
20+ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/dftables.c
21
22 pcre_chartables.c: dftables$(EXEEXT)
23 ./dftables$(EXEEXT) $@
24--- pcre-8.32.orig/configure.ac
25+++ pcre-8.32/configure.ac
26@@ -72,6 +72,22 @@ then
27 fi
28 fi
29
30+if test x"$cross_compiling" = xyes; then
31+ CC_FOR_BUILD="${CC_FOR_BUILD-gcc}"
32+ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-gcc}"
33+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}"
34+ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD}"
35+else
36+ CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}"
37+ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-\$(CCLD)}"
38+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-\$(CFLAGS)}"
39+ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD-\$(LDFLAGS)}"
40+fi
41+AC_ARG_VAR(CC_FOR_BUILD, [build system C compiler])
42+AC_ARG_VAR(CCLD_FOR_BUILD, [build system C linker frontend])
43+AC_ARG_VAR(CFLAGS_FOR_BUILD, [build system C compiler arguments])
44+AC_ARG_VAR(LDFLAGS_FOR_BUILD, [build system C linker frontend arguments])
45+
46 # AC_PROG_CXX will return "g++" even if no c++ compiler is installed.
47 # Check for that case, and just disable c++ code if g++ doesn't run.
48 AC_LANG_PUSH(C++)
diff --git a/meta/recipes-support/libpcre/libpcre_8.43.bb b/meta/recipes-support/libpcre/libpcre_8.43.bb
index d54b394197..e28615a8ba 100644
--- a/meta/recipes-support/libpcre/libpcre_8.43.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.43.bb
@@ -8,7 +8,6 @@ SECTION = "devel"
8LICENSE = "BSD" 8LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1" 9LIC_FILES_CHKSUM = "file://LICENCE;md5=91bee59d1b327eb1599b4c673e2fb3d1"
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://pcre-cross.patch \
12 file://fix-pcre-name-collision.patch \ 11 file://fix-pcre-name-collision.patch \
13 file://run-ptest \ 12 file://run-ptest \
14 file://Makefile \ 13 file://Makefile \
@@ -36,21 +35,7 @@ BINCONFIG = "${bindir}/pcre-config"
36 35
37inherit autotools binconfig-disabled ptest 36inherit autotools binconfig-disabled ptest
38 37
39EXTRA_OECONF = "\ 38EXTRA_OECONF = "--enable-utf"
40 --enable-newline-is-lf \
41 --enable-rebuild-chartables \
42 --enable-utf \
43 --with-link-size=2 \
44 --with-match-limit=10000000 \
45"
46
47# Set LINK_SIZE in BUILD_CFLAGS given that the autotools bbclass use it to
48# set CFLAGS_FOR_BUILD, required for the libpcre build.
49BUILD_CFLAGS =+ "-DLINK_SIZE=2 -I${B}"
50CFLAGS += "-D_REENTRANT"
51CXXFLAGS_append_powerpc = " -lstdc++"
52
53export CCLD_FOR_BUILD ="${BUILD_CCLD}"
54 39
55PACKAGES =+ "libpcrecpp libpcreposix pcregrep pcregrep-doc pcretest pcretest-doc" 40PACKAGES =+ "libpcrecpp libpcreposix pcregrep pcregrep-doc pcretest pcretest-doc"
56 41