summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-04-22 13:55:04 +0000
committerMike Frysinger <vapier@gentoo.org>2015-04-22 13:55:04 +0000
commit53142b7e39268e8879d05c3b7eaaa6374161ad9e (patch)
tree4bd743c96d6fe34a04ac0dc318262281b24a31e3 /x11-libs
parentversion bump, introduce jack useflag (diff)
downloadgentoo-2-53142b7e39268e8879d05c3b7eaaa6374161ad9e.tar.gz
gentoo-2-53142b7e39268e8879d05c3b7eaaa6374161ad9e.tar.bz2
gentoo-2-53142b7e39268e8879d05c3b7eaaa6374161ad9e.zip
Only add -finline-limit=1200 to CFLAGS when the compiler supports it to fix building with non-gcc (like clang).
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/cairo/ChangeLog6
-rw-r--r--x11-libs/cairo/cairo-1.10.2-r3.ebuild6
2 files changed, 8 insertions, 4 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index c73f65145ca8..57ef42fb8514 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/cairo
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.413 2015/04/13 08:24:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.414 2015/04/22 13:55:04 vapier Exp $
+
+ 22 Apr 2015; Mike Frysinger <vapier@gentoo.org> cairo-1.10.2-r3.ebuild:
+ Only add -finline-limit=1200 to CFLAGS when the compiler supports it to fix
+ building with non-gcc (like clang).
13 Apr 2015; Agostino Sarubbo <ago@gentoo.org> cairo-1.12.18-r1.ebuild:
Stable for alpha, wrt bug #540676
diff --git a/x11-libs/cairo/cairo-1.10.2-r3.ebuild b/x11-libs/cairo/cairo-1.10.2-r3.ebuild
index a16e43a98e2d..907a938e7fd5 100644
--- a/x11-libs/cairo/cairo-1.10.2-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.10.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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-r3.ebuild,v 1.15 2014/07/26 08:57:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r3.ebuild,v 1.16 2015/04/22 13:55:04 vapier Exp $
EAPI=3
@@ -95,7 +95,7 @@ src_configure() {
[[ ${CHOST} == powerpc*-*-darwin* ]] && filter-flags -mcpu=*
#gets rid of fbmmx.c inlining warnings
- append-flags -finline-limit=1200
+ append-flags $(test-flags-CC -finline-limit=1200)
if use X; then
myopts+="