Fix compile on arm, bug #478324 by Michael Kurinnoy.

(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 30427902)

3 files changed, 34 insertions, 2 deletions

diff --git a/dev-libs/re2/ChangeLog b/dev-libs/re2/ChangeLog
index e8659b6694a6..8dfda0d5bc82 100644
--- a/dev-libs/re2/ChangeLog
+++ b/dev-libs/re2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/re2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/ChangeLog,v 1.9 2013/07/24 16:22:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/ChangeLog,v 1.10 2013/09/22 23:39:45 phajdan.jr Exp $
+
+  22 Sep 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/re2-compile-r0.patch, re2-0_p20130712.ebuild:
+  Fix compile on arm, bug #478324 by Michael Kurinnoy.
 
 *re2-0_p20130712 (24 Jul 2013)
 
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 000000000000..cf2c8c0d5717
--- /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/re2-0_p20130712.ebuild b/dev-libs/re2/re2-0_p20130712.ebuild
index 42ee23d78769..94c1c274c149 100644
--- a/dev-libs/re2/re2-0_p20130712.ebuild
+++ b/dev-libs/re2/re2-0_p20130712.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/re2-0_p20130712.ebuild,v 1.1 2013/07/24 16:22:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/re2-0_p20130712.ebuild,v 1.2 2013/09/22 23:39:45 phajdan.jr Exp $
 
 EAPI=5
 
@@ -19,6 +19,7 @@ IUSE=""
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-compile-r0.patch"
 	multilib_copy_sources
 }