summaryrefslogtreecommitdiffstats
path: root/package/pcre/pcre-no-compat.patch
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2013-09-03 11:33:15 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2013-09-03 23:45:03 +0200
commite2b3d5909d909970c85cbc339e17dbfe09cb3197 (patch)
tree59d9747cd9351992bbef7aa3326a80239f4b3fc4 /package/pcre/pcre-no-compat.patch
parent3d2001f2871a85891e216fbc9ad894f5c671c1c1 (diff)
downloadbuildroot-e2b3d5909d909970c85cbc339e17dbfe09cb3197.tar.gz
buildroot-e2b3d5909d909970c85cbc339e17dbfe09cb3197.zip
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>
Diffstat (limited to 'package/pcre/pcre-no-compat.patch')
-rw-r--r--package/pcre/pcre-no-compat.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/package/pcre/pcre-no-compat.patch b/package/pcre/pcre-no-compat.patch
deleted file mode 100644
index 7099727737..0000000000
--- a/package/pcre/pcre-no-compat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Kill ABI compatibility bits, we don't need them.
-Fixes build failures on non-ELF (blackfin) targets.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura pcre-8.32.orig/pcrecpp.cc pcre-8.32/pcrecpp.cc
---- pcre-8.32.orig/pcrecpp.cc 2012-12-28 08:32:10.193847937 -0300
-+++ pcre-8.32/pcrecpp.cc 2012-12-28 08:32:26.924376180 -0300
-@@ -58,22 +58,6 @@
- // Special object that stands-in for no argument
- Arg RE::no_arg((void*)NULL);
-
--// This is for ABI compatibility with old versions of pcre (pre-7.6),
--// which defined a global no_arg variable instead of putting it in the
--// RE class. This works on GCC >= 3, at least. It definitely works
--// for ELF, but may not for other object formats (Mach-O, for
--// instance, does not support aliases.) We could probably have a more
--// inclusive test if we ever needed it. (Note that not only the
--// __attribute__ syntax, but also __USER_LABEL_PREFIX__, are
--// gnu-specific.)
--#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__)
--# define ULP_AS_STRING(x) ULP_AS_STRING_INTERNAL(x)
--# define ULP_AS_STRING_INTERNAL(x) #x
--# define USER_LABEL_PREFIX_STR ULP_AS_STRING(__USER_LABEL_PREFIX__)
--extern Arg no_arg
-- __attribute__((alias(USER_LABEL_PREFIX_STR "_ZN7pcrecpp2RE6no_argE")));
--#endif
--
- // If a regular expression has no error, its error_ field points here
- static const string empty_string;
-
OpenPOWER on IntegriCloud