summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <opfer@gentoo.org>2008-02-13 08:12:02 +0000
committerChristian Faulhammer <opfer@gentoo.org>2008-02-13 08:12:02 +0000
commitb19203e566386e06370465ac183604b7749dc4fc (patch)
tree91841f1f38092215570dcacd9452cc492688842b /dev-libs/libpcre/files
parentquote variable (diff)
downloadgentoo-2-b19203e566386e06370465ac183604b7749dc4fc.tar.gz
gentoo-2-b19203e566386e06370465ac183604b7749dc4fc.tar.bz2
gentoo-2-b19203e566386e06370465ac183604b7749dc4fc.zip
revision bump (direct stable), to fix ABI breakage reported in bug 209697 by jakub
(Portage version: 2.1.3.19, RepoMan options: --force)
Diffstat (limited to 'dev-libs/libpcre/files')
-rw-r--r--dev-libs/libpcre/files/libpcre-7.6-ABI_correction.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/dev-libs/libpcre/files/libpcre-7.6-ABI_correction.patch b/dev-libs/libpcre/files/libpcre-7.6-ABI_correction.patch
new file mode 100644
index 000000000000..99da95c7458a
--- /dev/null
+++ b/dev-libs/libpcre/files/libpcre-7.6-ABI_correction.patch
@@ -0,0 +1,17 @@
+--- pcrecpp.cc.orig 2008-02-13 09:04:56.000000000 +0100
++++ pcrecpp.cc 2008-02-13 09:05:28.000000000 +0100
+@@ -57,6 +57,14 @@
+ // 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. We could probably have
++// a more inclusive test if we ever needed it.
++#if defined(__GNUC__) && __GNUC__ >= 3
++ extern Arg no_arg __attribute__((alias("_ZN7pcrecpp2RE6no_argE")));
++#endif
++
+ // If a regular expression has no error, its error_ field points here
+ static const string empty_string;
+