summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/re2/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/re2/files')
-rw-r--r--dev-libs/re2/files/re2-compile-r0.patch27
-rw-r--r--dev-libs/re2/files/re2-symbols-r0.patch10
2 files changed, 37 insertions, 0 deletions
diff --git a/dev-libs/re2/files/re2-compile-r0.patch b/dev-libs/re2/files/re2-compile-r0.patch
new file mode 100644
index 00000000000..cf2c8c0d571
--- /dev/null
+++ b/dev-libs/re2/files/re2-compile-r0.patch
@@ -0,0 +1,27 @@
+--- util/mutex.h.orig 2013-09-22 13:24:25.126582479 -0500
++++ util/mutex.h 2013-09-22 13:25:11.376179517 -0500
+@@ -10,6 +10,8 @@
+ #ifndef RE2_UTIL_MUTEX_H_
+ #define RE2_UTIL_MUTEX_H_
+
++#include <stdlib.h>
++
+ namespace re2 {
+
+ #define HAVE_PTHREAD 1
+@@ -102,7 +104,6 @@
+
+ #elif defined(HAVE_PTHREAD) && defined(HAVE_RWLOCK)
+
+-#include <stdlib.h> // for abort()
+ #define SAFE_PTHREAD(fncall) do { if ((fncall) != 0) abort(); } while (0)
+
+ Mutex::Mutex() { SAFE_PTHREAD(pthread_rwlock_init(&mutex_, NULL)); }
+@@ -117,7 +118,6 @@
+
+ #elif defined(HAVE_PTHREAD)
+
+-#include <stdlib.h> // for abort()
+ #define SAFE_PTHREAD(fncall) do { if ((fncall) != 0) abort(); } while (0)
+
+ Mutex::Mutex() { SAFE_PTHREAD(pthread_mutex_init(&mutex_, NULL)); }
diff --git a/dev-libs/re2/files/re2-symbols-r0.patch b/dev-libs/re2/files/re2-symbols-r0.patch
new file mode 100644
index 00000000000..1fb9f2e35c4
--- /dev/null
+++ b/dev-libs/re2/files/re2-symbols-r0.patch
@@ -0,0 +1,10 @@
+--- libre2.symbols.orig 2012-11-07 04:45:57.000000000 +0100
++++ libre2.symbols 2012-11-07 04:46:20.000000000 +0100
+@@ -10,6 +10,7 @@
+ _ZlsRSoRKN3re211StringPieceE;
+ # re2::FilteredRE2*
+ _ZN3re211FilteredRE2*;
++ _ZNK3re211FilteredRE2*;
+ local:
+ *;
+ };