summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2013-09-22 23:39:52 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2013-09-22 23:39:52 +0000
commit03792a9de3919df414561fa68148d21f0c33780c (patch)
tree23b804c3c75c519e10a23a4f24935c963b33621e /dev-libs/re2
parentAvoid elibtoolize warning (bug #484988). (diff)
downloadhistorical-03792a9de3919df414561fa68148d21f0c33780c.tar.gz
historical-03792a9de3919df414561fa68148d21f0c33780c.tar.bz2
historical-03792a9de3919df414561fa68148d21f0c33780c.zip
Fix compile on arm, bug #478324 by Michael Kurinnoy.
Package-Manager: portage-2.2.1/cvs/Linux i686 Manifest-Sign-Key: 0x30427902
Diffstat (limited to 'dev-libs/re2')
-rw-r--r--dev-libs/re2/ChangeLog6
-rw-r--r--dev-libs/re2/Manifest11
-rw-r--r--dev-libs/re2/files/re2-compile-r0.patch27
-rw-r--r--dev-libs/re2/re2-0_p20130712.ebuild3
4 files changed, 40 insertions, 7 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/Manifest b/dev-libs/re2/Manifest
index a99b0f2568b5..689e81685025 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,18 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX re2-compile-r0.patch 782 SHA256 c5034495529d97aaaaa98ab85b54f0fab1ad0e97bb3193ed0559a9e8f8fa6169 SHA512 02fa21b4d8b57072fc3a5a5410aa5eb41f31ac4b1f21af3b05c214f01dd50c6481929a48eb508d72a3d02c8f11e8b3c015729f17cfdc32405ec3f569509c42ec WHIRLPOOL 72bd73062bd0e852792d3d8a8b9822eef578dd2cd9ac3b6c88f6d74cf756febb33daf8e8e23df8fc28aecec1fcdefd5b10e50de985f934691a77259ec03dc0e6
AUX re2-symbols-r0.patch 261 SHA256 7db8997c9610ad4c1e5b7287bcbe005e1a29782a7e4988a6e71688a75ffb4951 SHA512 9f90010d802a017842c9d2a9a5c9cd5002dd4e24e318c13e3d79e8b4031f0cd0a6150257e217f4210ae4efa5e62e9c392dc3c3cd314f66849ed252e9eaabd05c WHIRLPOOL 86d0f59bec9f4073fa05879330348bce27901223201437eafb04dee15e51003bb19eceabbafa6bc594f3f5cbdad80f6946642b66c7e2a0e94223a58002b9b9ee
DIST re2-20130115.tgz 1020951 SHA256 a95d83ed8203817587f7cc368b6f7199d8a4b1558372c306b07201058b92e1fe SHA512 ef1378d89397bf594ece7817ef91171e467a3408046f769eca08beba900a0e70f652e7c4e3b667b3a9d5cef044b08ed74ef7d564ffb965ab75bb9a3964c9ab5a WHIRLPOOL 2cbf47b1816e35e5c7f359a310b4421ad635d1513167ffabf98db84397be800f8b98d4808705754f0e2db14bbeb0d62e47ac3abb385e299c503126a9f874daf5
DIST re2-20130712.tgz 1028311 SHA256 c30e43524280ebc2b9afa8c40ad477d0b2665bc81b663e9ae1b8b48e053af54b SHA512 910e7c7f5b3268746355c2e14dc6a4e32105207abcf8cb56b76fc554be41768e4e4a6b526c9335e95be0bb111025876b61ede1cfebcbec4a4062d53bb1448e08 WHIRLPOOL e5cf26a6c8586503c1639dd3f528cace8a4d7ca4c4ff97e08b12f45753ff67ad78656513658eabd678ac8ab88f1de5279960428fffe1b9e0535afdba44e7e8a3
EBUILD re2-0_p20130115-r1.ebuild 1333 SHA256 595ea395197703935cb060d60baf1813bec2c884738c50a7e173203942cef630 SHA512 20ef887086b9aa478086f44cf88bf4fe5e2f1deafb4e220bde740052acb847259404d439340a5ab623d8d85d17298344746919a41e6424097e465d3c506d0f29 WHIRLPOOL 88745ac3f8f21562699d5606481b4ec07d426674f4736dc3dc6db0c34a222d5c8ace89ab17432a952789cda01db03700c728317f284071d7fc57190fa669ad12
EBUILD re2-0_p20130115.ebuild 1206 SHA256 f1ef33738516b9a843270b302c238002c0a55c6edb0bcb3f6e2034c228cb612d SHA512 249ea0fe32ddba3081ae32da1629c5d56d47d523f54c8af234c5131c90d0b37ee532e2582cf28c9fb738bfa736bdc3338bf90c2ed101754cde67f4aa75512c50 WHIRLPOOL 26777dc71e23777ed7714841a2921ff63f756039dec97d2ea0ff1101c3e8d396add35305568962346e329c4c14fad6e02f12b9d34f5959a9446ac9559554ff1f
-EBUILD re2-0_p20130712.ebuild 1227 SHA256 a16aa6b90d58d05eaa234e01af62b49710f8ce1f8baab8cdd0edad6d7c11747c SHA512 be0999c5d4713ef2730d62bdc81527ee20b98c1e9bb1f8dbd61c5f8b885e429cd2f7c9b5b653dc67986f3ae44ff4c15af52f4835ce9b92622ff41ce0f7c30351 WHIRLPOOL 2a94bb26677305954648286ecde6f5af0d6e4e73aa5f16447f67f790b16b162514e6992e0e52b66dfe776f8541243ccd2b27f19131a547cf8532b9f457af0f1e
-MISC ChangeLog 1808 SHA256 bb8074bcd9515cc6c8bd69f80098e63843f54ed680f6452e2a06833fe98afab0 SHA512 78a113e92e1bc5420427351f5e107e1aff4fab5d21ed0b1d96dfc3ce7982036f235b4ae68e3127a47a0343c7c6c201d37768a2e41ee8d70b96026e171dbf1b1b WHIRLPOOL c118997164bb0d0ac013992382338a27d41a0197700d7c8cd44c5575b7230d1acb5c2dc058ae7e084cbc2027cba7441f058a8307c037dc838dc56c45f6ce1eca
+EBUILD re2-0_p20130712.ebuild 1272 SHA256 2de5c9929559162f86d3bb1f82d7320afd044e5bd9c37906afda2b735042c70d SHA512 6e36d595f8e9713371ef968cc8bef035ad21896468a46c084ec080add00363418eaefe09a5018bbe7728c19b0008ebc47bc8952ef331686326f8c3fec1fc9499 WHIRLPOOL b33a266f65d3051dbd0b5680df75d7eba568a872cc6c6bbba1457d0ecde4e08b34cafcc14e4bfbf8b7798df8d6cd1afdf0c42de8f5ad8968d6349cd594e9791a
+MISC ChangeLog 1975 SHA256 00ae3c27183095772c0be51a918c5371da6ea7d2c32d2179954a32bac1261e87 SHA512 c83420ce76d282e7f4d90f080904fb2d6c12dd6fa5d2ea696a6ea4eac2d4983e384fe66c94df8f0a7d4dad1e7451053802e451dd2073f6a05b4f66099f0ed7c2 WHIRLPOOL 3565ede32432a113ebc23201d4ca0767a6e148e615bcb0a8482ae7057d4136d165c8cb848ac0bc46ba0f8849ea4aa233d574e90658903f0fd72a124d26f91a22
MISC metadata.xml 162 SHA256 8a3ecdcf518f45ec4843398f9896c9b4d1c867ff2cf2851cf40b06f756f111e8 SHA512 51796fe7e55b73dbfbe4a6b5fd089f5e8e4d327ff67d4a267692dda38380df5048ea77e8f058c466ae17726af5f099a3240b0500d53e421d95acc583164d3fe9 WHIRLPOOL 279b6ed997fab0d4278c01814bdd067068bceff8d1ce9933087828ce7598513b5a809013c996a3b134da6072c698a87ae151cfb56407fd62ff465b165197f5bf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iEYEAREIAAYFAlHv/2MACgkQuUQtlDBCeQI+EQCeNtn9LlulqyhOYSx/aG2pEM4k
-dcYAmgL8nK9bCWlxIGUin8ueVvyKQQsg
-=ls2n
+iEYEAREIAAYFAlI/f8cACgkQuUQtlDBCeQJtSwCaA3Ex8hYp8f+NWqsanWCi+usp
+QTcAnivAIMOW3hDj+R90lSyAw7Muv47J
+=INDu
-----END PGP SIGNATURE-----
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
}