mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-01 07:27:43 +00:00
pcre: bump to version 8.32
Bump PCRE to version 8.32 Also add a patch to remove compatibility bits, fixing: http://autobuild.buildroot.net/results/e380b838296c85ff9aeaec9fa088bded69670307/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
496f7ca974
commit
fe2ca806b0
31
package/pcre/pcre-no-compat.patch
Normal file
31
package/pcre/pcre-no-compat.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
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;
|
||||||
|
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
||||||
PCRE_VERSION = 8.31
|
PCRE_VERSION = 8.32
|
||||||
PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
|
PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
|
||||||
PCRE_LICENSE = BSD-3c
|
PCRE_LICENSE = BSD-3c
|
||||||
PCRE_LICENSE_FILES = LICENCE
|
PCRE_LICENSE_FILES = LICENCE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user