summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2013-09-03 14:33:15 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-09-03 21:45:03 (GMT)
commite2b3d5909d909970c85cbc339e17dbfe09cb3197 (patch)
tree59d9747cd9351992bbef7aa3326a80239f4b3fc4
parent3d2001f2871a85891e216fbc9ad894f5c671c1c1 (diff)
downloadbuildroot-e2b3d5909d909970c85cbc339e17dbfe09cb3197.tar.gz
buildroot-e2b3d5909d909970c85cbc339e17dbfe09cb3197.tar.bz2
pcre: fix C++ static build problem
PCRE C++ unit tests fails to build properly for static scenarios since it's not taken account for properly in the build system. Just disable them, they're never installed to the target. Fixes: http://autobuild.buildroot.net/results/970/97027b981659502ff12c345c3caef4933cddb354/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/pcre/pcre-01-no-compat.patch (renamed from package/pcre/pcre-no-compat.patch)0
-rw-r--r--package/pcre/pcre-02-no-cpp-tests.patch31
2 files changed, 31 insertions, 0 deletions
diff --git a/package/pcre/pcre-no-compat.patch b/package/pcre/pcre-01-no-compat.patch
index 7099727..7099727 100644
--- a/package/pcre/pcre-no-compat.patch
+++ b/package/pcre/pcre-01-no-compat.patch
diff --git a/package/pcre/pcre-02-no-cpp-tests.patch b/package/pcre/pcre-02-no-cpp-tests.patch
new file mode 100644
index 0000000..0255028
--- /dev/null
+++ b/package/pcre/pcre-02-no-cpp-tests.patch
@@ -0,0 +1,31 @@
+Disable PCRE C++ unit tests, they fail to build on static scenarios
+and they're not installed.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura pcre-8.33.orig/Makefile.in pcre-8.33/Makefile.in
+--- pcre-8.33.orig/Makefile.in 2013-05-28 06:09:27.000000000 -0300
++++ pcre-8.33/Makefile.in 2013-09-03 11:28:28.398198832 -0300
+@@ -123,12 +123,6 @@
+ @WITH_PCRE8_TRUE@am__append_20 = libpcreposix.la
+ @WITH_GCOV_TRUE@@WITH_PCRE8_TRUE@am__append_21 = $(GCOV_CFLAGS)
+ @WITH_PCRE_CPP_TRUE@am__append_22 = libpcrecpp.la
+-@WITH_PCRE_CPP_TRUE@am__append_23 = pcrecpp_unittest \
+-@WITH_PCRE_CPP_TRUE@ pcre_scanner_unittest \
+-@WITH_PCRE_CPP_TRUE@ pcre_stringpiece_unittest
+-@WITH_PCRE_CPP_TRUE@am__append_24 = pcrecpp_unittest \
+-@WITH_PCRE_CPP_TRUE@ pcre_scanner_unittest \
+-@WITH_PCRE_CPP_TRUE@ pcre_stringpiece_unittest
+ @WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_25 = $(GCOV_CXXFLAGS)
+ @WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_26 = $(GCOV_LIBS)
+ @WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_27 = $(GCOV_LIBS)
+@@ -360,9 +354,6 @@
+ @WITH_PCRE8_TRUE@am__EXEEXT_1 = pcregrep$(EXEEXT)
+ @WITH_REBUILD_CHARTABLES_TRUE@am__EXEEXT_2 = dftables$(EXEEXT)
+ @WITH_JIT_TRUE@am__EXEEXT_3 = pcre_jit_test$(EXEEXT)
+-@WITH_PCRE_CPP_TRUE@am__EXEEXT_4 = pcrecpp_unittest$(EXEEXT) \
+-@WITH_PCRE_CPP_TRUE@ pcre_scanner_unittest$(EXEEXT) \
+-@WITH_PCRE_CPP_TRUE@ pcre_stringpiece_unittest$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ am__dftables_SOURCES_DIST = dftables.c
+ @WITH_REBUILD_CHARTABLES_TRUE@am_dftables_OBJECTS = \