mgorny 14/12/23 21:27:09
Modified: cairo-1.12.16-r4.ebuild cairo-1.12.16-r3.ebuild
ChangeLog
Log:
Disable LTO unconditionally on 1.12.16* since it does not work properly (bug
#510782) and was removed in 1.12.18.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.2 x11-libs/cairo/cairo-1.12.16-r4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r4.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r4.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r4.ebuild?r1=1.1&r2=1.2
Index: cairo-1.12.16-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cairo-1.12.16-r4.ebuild 29 Nov 2014 23:37:46 -0000 1.1
+++ cairo-1.12.16-r4.ebuild 23 Dec 2014 21:27:09 -0000 1.2
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r4.ebuild,v
1.1 2014/11/29 23:37:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r4.ebuild,v
1.2 2014/12/23 21:27:09 mgorny Exp $
EAPI=5
-inherit check-reqs eutils flag-o-matic autotools multilib-minimal
+inherit eutils flag-o-matic autotools multilib-minimal
if [[ ${PV} == *9999* ]]; then
inherit git-2
@@ -19,7 +19,7 @@
HOMEPAGE="http://cairographics.org/";
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers lto opengl
openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers opengl
openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
# gtk-doc regeneration doesn't seem to work with out-of-source builds
#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in
tarball, no need to regenerate
@@ -84,21 +84,6 @@
/usr/include/cairo/cairo-directfb.h
)
-CHECKREQS_MEMORY="768M"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then
- einfo "Checking for sufficient memory to build $PN with USE=lto"
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then
- check-reqs_pkg_setup
- fi
-}
-
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
use legacy-drivers && epatch
"${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
@@ -166,7 +151,6 @@
$(use_enable gallium) \
$(use_enable gles2 glesv2) \
$(use_enable glib gobject) \
- $(use_enable lto) \
$(use_enable openvg vg) \
$(use_enable opengl gl) \
$(use_enable qt4 qt) \
@@ -180,6 +164,7 @@
--enable-pdf \
--enable-png \
--enable-ps \
+ --disable-lto \
${myopts}
}
1.8 x11-libs/cairo/cairo-1.12.16-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild?r1=1.7&r2=1.8
Index: cairo-1.12.16-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cairo-1.12.16-r3.ebuild 20 Nov 2014 09:29:25 -0000 1.7
+++ cairo-1.12.16-r3.ebuild 23 Dec 2014 21:27:09 -0000 1.8
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild,v
1.7 2014/11/20 09:29:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild,v
1.8 2014/12/23 21:27:09 mgorny Exp $
EAPI=5
-inherit check-reqs eutils flag-o-matic autotools multilib-minimal
+inherit eutils flag-o-matic autotools multilib-minimal
if [[ ${PV} == *9999* ]]; then
inherit git-2
@@ -19,7 +19,7 @@
HOMEPAGE="http://cairographics.org/";
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers lto opengl
openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers opengl
openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
# gtk-doc regeneration doesn't seem to work with out-of-source builds
#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in
tarball, no need to regenerate
@@ -85,21 +85,6 @@
/usr/include/cairo/cairo-directfb.h
)
-CHECKREQS_MEMORY="768M"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then
- einfo "Checking for sufficient memory to build $PN with USE=lto"
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then
- check-reqs_pkg_setup
- fi
-}
-
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
use legacy-drivers && epatch
"${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
@@ -167,7 +152,6 @@
$(use_enable gallium) \
$(use_enable gles2 glesv2) \
$(use_enable glib gobject) \
- $(use_enable lto) \
$(use_enable openvg vg) \
$(use_enable opengl gl) \
$(use_enable qt4 qt) \
@@ -181,6 +165,7 @@
--enable-pdf \
--enable-png \
--enable-ps \
+ --disable-lto \
${myopts}
}
1.393 x11-libs/cairo/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.393&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.393&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.392&r2=1.393
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- ChangeLog 12 Dec 2014 21:50:18 -0000 1.392
+++ ChangeLog 23 Dec 2014 21:27:09 -0000 1.393
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/cairo
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.392 2014/12/12
21:50:18 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.393 2014/12/23
21:27:09 mgorny Exp $
+
+ 23 Dec 2014; Michał Górny <[email protected]> cairo-1.12.16-r3.ebuild,
+ cairo-1.12.16-r4.ebuild:
+ Disable LTO unconditionally on 1.12.16* since it does not work properly (bug
+ #510782) and was removed in 1.12.18.
12 Dec 2014; Matt Turner <[email protected]> cairo-1.12.18.ebuild,
files/cairo-1.12.18-disable-test-suite.patch:
