summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2011-07-03 10:45:00 +0000
committerRaúl Porcel <armin76@gentoo.org>2011-07-03 10:45:00 +0000
commitc1b9ca53441c151f0a873c84c601a4831439f679 (patch)
treeffaed85eab32fe0240dd6c8fa9255a71ea9d3b2f /x11-libs/cairo
parentFix segfault with recent ffmpeg versions (bug #373423 by Mike MacDonald) (diff)
downloadhistorical-c1b9ca53441c151f0a873c84c601a4831439f679.tar.gz
historical-c1b9ca53441c151f0a873c84c601a4831439f679.tar.bz2
historical-c1b9ca53441c151f0a873c84c601a4831439f679.zip
Add --disable-atomic for sh
Package-Manager: portage-2.1.10.3/cvs/Linux ia64
Diffstat (limited to 'x11-libs/cairo')
-rw-r--r--x11-libs/cairo/ChangeLog6
-rw-r--r--x11-libs/cairo/Manifest12
-rw-r--r--x11-libs/cairo/cairo-1.10.2-r1.ebuild5
-rw-r--r--x11-libs/cairo/cairo-9999.ebuild6
4 files changed, 20 insertions, 9 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 98ebca017d1a..b929546a06de 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/cairo
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.281 2011/04/29 12:05:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.282 2011/07/03 10:45:00 armin76 Exp $
+
+ 03 Jul 2011; Raúl Porcel <armin76@gentoo.org> cairo-1.10.2-r1.ebuild,
+ cairo-9999.ebuild:
+ Add --disable-atomic for sh
29 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> cairo-1.10.2-r1.ebuild,
cairo-9999.ebuild, metadata.xml:
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 065db43c370f..1adeadc10540 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -8,15 +8,15 @@ AUX cairo-1.8.8-interix.patch 619 RMD160 9bb28c5a88aa1f2776d32ac7020aef4ba93872b
DIST cairo-1.10.2.tar.gz 23558405 RMD160 8c8de00120398fe2b3a60a08ff59a464b2eebf47 SHA1 ccce5ae03f99c505db97c286a0c9a90a926d3c6e SHA256 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
DIST cairo-1.8-lcd_filter.patch.bz2 7067 RMD160 5c2ee470022788df88425da24cebea3baed69298 SHA1 9202c14967a633a9e57dd203695896d0197fea8b SHA256 6965d46df45d8382d122170a0f1dfaeb25bd68adc998b42f62397123e5795d1d
DIST cairo-1.8.10.tar.gz 7102657 RMD160 9538baf30f812b950beeb93893f46d1223fb44ce SHA1 fd5e8ca82ff0e8542ea4c51612cad387f2a49df3 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
-EBUILD cairo-1.10.2-r1.ebuild 4024 RMD160 b836742271bbda1b943f29f57de1cef6ad9d9beb SHA1 6fb87e8c92ec159e142b179422a6d90061ca38e2 SHA256 a71de5e7af3e0e3841d912c4b36e8e7a1d24daccbf30746e3d9f2b81154855fc
+EBUILD cairo-1.10.2-r1.ebuild 4104 RMD160 2a0f29571b9111f1c644798cfab651ff0f0b5ff5 SHA1 dff255c2fe3a7f49c24be132a5f98407b26ba834 SHA256 ec7b462a7334c3982288c7525df37892a961059ee629f97009605291178aecae
EBUILD cairo-1.8.10.ebuild 3451 RMD160 c9205d9e45a024a67c3a7acb247a4f6feb21f4e2 SHA1 84ca8d3e011c476dc899e7f850d6885277643d15 SHA256 0fd58c9f5c9255f94864d9b137d6b4d940281d088a2f4f498a6b1495daca438c
-EBUILD cairo-9999.ebuild 3662 RMD160 afa3c861e018294cd29a6d780ec981bf14ceff57 SHA1 e2783aea65e957ed00a036021b60762c6eefb9d3 SHA256 ad596238332188e2e07bb8c6cbb0260514394302cd8a77a6b92d6e55373ee527
-MISC ChangeLog 39541 RMD160 73bb93bc634be5186bc2418f020bf8040b64c0bb SHA1 f7dcf027c1a66cf9e5b21a43673981e870f37fc5 SHA256 05f5edd1344ca5a5a2f97b70469ded5147a7fe2549d62e1fcb3e27b3f2f35659
+EBUILD cairo-9999.ebuild 3743 RMD160 5eae2ede871488dc710a1e073a461ca20c0d53c2 SHA1 ee29bbfe015418ef028b9b4a0ff0a79642d5f82b SHA256 551ec3a9e849618ddeee7f21098a6b9895301a656c565654d1520e1e2f702363
+MISC ChangeLog 39664 RMD160 9db1cd097e379a67c1a8b4dc7dc8938310d4d65a SHA1 aab51ddea6ed079bf309f2e3d56eed7319f822bd SHA256 60c79856aea25dfbbad0e6ae9587d7b7c5d439d492b1cf84b68b3b35964d823b
MISC metadata.xml 998 RMD160 2a4f5df13bc9d39c91e12e80924465450d758e32 SHA1 f4e943a00531a6f6a5ca2945a05ab95233b63e3b SHA256 325e1f55131748f3840ed1cfec421fe27aa6a621568135e4f6ce1d517b5d3cd8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk26qXAACgkQHB6c3gNBRYf/fgCfXhUjCscjCBiqNcNzezJUKewZ
-8CMAnRWmOsTLbu3ih5xJBEwFk3j5ObJJ
-=07b8
+iEYEARECAAYFAk4QSDMACgkQuQc30/atMkDIDgCeJhvoa/oztANYDiNUMHHvCr4g
+aWUAn0TFUaNJCDxOvrn9MFHOnPZvAaDR
+=3sVK
-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.10.2-r1.ebuild b/x11-libs/cairo/cairo-1.10.2-r1.ebuild
index f63784d886a0..53f72976ccd6 100644
--- a/x11-libs/cairo/cairo-1.10.2-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.10.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.11 2011/04/29 12:05:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.12 2011/07/03 10:45:00 armin76 Exp $
EAPI=3
@@ -80,6 +80,9 @@ src_prepare() {
src_configure() {
local myopts
+ # SuperH doesn't have native atomics yet
+ use sh && myopts+=" --disable-atomic"
+
[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
# tracing fails to compile, because Solaris' libelf doesn't do large files
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index d5c5aac5b4b5..005f90a5e53f 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.12 2011/04/29 12:05:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.13 2011/07/03 10:45:00 armin76 Exp $
EAPI=4
@@ -86,6 +86,10 @@ src_prepare() {
src_configure() {
local myopts
+ # SuperH doesn't have native atomics yet
+ use sh && myopts+=" --disable-atomic"
+
+
[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
# http://bugs.freedesktop.org/show_bug.cgi?id=15463
[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS