diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2011-07-03 10:45:00 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2011-07-03 10:45:00 +0000 |
| commit | b84eaad577062fbf4c466050e5d97418d7075bb1 (patch) | |
| tree | 5979592a1e15fb56882cc30fe82592247e1a832d /x11-libs | |
| parent | Fix segfault with recent ffmpeg versions (bug #373423 by Mike MacDonald) (diff) | |
| download | gentoo-2-b84eaad577062fbf4c466050e5d97418d7075bb1.tar.gz gentoo-2-b84eaad577062fbf4c466050e5d97418d7075bb1.tar.bz2 gentoo-2-b84eaad577062fbf4c466050e5d97418d7075bb1.zip | |
Add --disable-atomic for sh
(Portage version: 2.1.10.3/cvs/Linux ia64)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/cairo/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-1.10.2-r1.ebuild | 5 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-9999.ebuild | 6 |
3 files changed, 14 insertions, 3 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/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 |