From: Michał Górny Date: Tue, 23 Dec 2014 21:27:11 +0000 (+0000) Subject: Disable LTO unconditionally on 1.12.16* since it does not work properly (bug #510782... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=215ae31244361c17d9915d3c33bd3cc3ae999bd7;p=gentoo.git Disable LTO unconditionally on 1.12.16* since it does not work properly (bug #510782) and was removed in 1.12.18. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog index eb54d3ca294d..849d50062544 100644 --- a/x11-libs/cairo/ChangeLog +++ b/x11-libs/cairo/ChangeLog @@ -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 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 cairo-1.12.18.ebuild, files/cairo-1.12.18-disable-test-suite.patch: diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index eb1519eed5c4..866d0e23d44a 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -24,27 +24,29 @@ DIST cairo-1.12.18.tar.xz 38276736 SHA256 dc59f0b7ac945ce4e138a03c227a29260915a8 EBUILD cairo-1.10.2-r3.ebuild 4382 SHA256 1656fb57c943b71b588ca8427320067fdf91ae83331e8c4dead61a2461c83c18 SHA512 8392faa29b007706de4c2b6d61e3507bfcbccc07689239c7eb98e8b19547d4c656b18f507188e1d150a63f18782d864ecd4c5d70abff7c22033a4be5e775d9bf WHIRLPOOL 515c656ea979ed756b38f42db19b839f679c52a9f349a84430aaf31467634f66355d8a2d41a578d39e2ea6179c4baec94b73eefdba5905b8c291269070a00fb7 EBUILD cairo-1.12.14-r4.ebuild 4232 SHA256 a9500a5fa9b6d903037ee11953945799c5031f8c568e03c3cf5464159223620c SHA512 b5804488072756fc86fcd4c35d536b9bad30456319df6f0fec9cf8061ae8a76cebe79c2d002f22e26300ae8a71b7057f847a8b1951307bb46a863dfaa60694db WHIRLPOOL 64dcd45bd8e7e4cc5f8956e31724f32596cc840cad495c7b79ab224f91259c6ec0708b819166b85fd01d06387e43522d3e8660cfc4c95c9af8344adc4460663c EBUILD cairo-1.12.16-r2.ebuild 5491 SHA256 67a756c661a62d5fc1c81638dd95b80a8774d39d8c26e73fa12f5b850de1a785 SHA512 bbd0d9a8a2486607a1edc6576f40a92503ebdc86223a5c31b5f5a319d88735fce18a643f4801ff40713a3a9b1b803f67b5974ca70d542973772085ce70a6cd5b WHIRLPOOL d7228036b8924d765c2b9637688cbe97b9abe9b56c44e96c1bdbac09a183dc60a836eba30f39a1fc13a12dd0b05f3fb5d1af9387aa716e5178dc68a0e58b442e -EBUILD cairo-1.12.16-r3.ebuild 6319 SHA256 744195ffd3e0b6642952020b90420a540573c1c8f47bffb9cfd9f77a7edccbcb SHA512 6acd16eb8cde5e2840481fa483e713904eb55e06e5c4871eaa6870dbd462a326d699add667f3027926ce5fba8747422e86b420a41bee074f8ea5bd62fdc0acb2 WHIRLPOOL 018160c7ff32778ca4da60124c2b2c892e37d0d10ec0ca58e932b93f2f1c0c21b2a04f96adb0db52defda8ad13b1ddf75804eaa642732748bcdba4b824adb530 -EBUILD cairo-1.12.16-r4.ebuild 6282 SHA256 0f62952b384a75909bd2c1431e1f36f724920cacfe7a69f8bf8ede87756add33 SHA512 a05b2071def409e2b86520173439ce08865b0b10208e414a4af4046f7e9bb195161b3f4bb1372278f2973a82d9bc1384ae9c697ed3ecc820e74f07dd67f9e872 WHIRLPOOL 37da1d8d043ca5271045648d1a7657cb22a2b64c0839239e8f16e40825916eee4255b22e4fe477696a5ee335cf58d5e260acf65aa7165a2f9d8bf0cd2cc9679f +EBUILD cairo-1.12.16-r3.ebuild 6010 SHA256 969f19a64a47e4e812c472c52588c1a574a37e5855ece60a041a593ca78f9294 SHA512 2fd9e6925b7cf0ee1ccf2e2b25a6fec30698b40ca4ca96f2524a511a7c89d239d0ccec8bbfcb22d15ea2526682f3d3a4d8891e5b229c067d25478cdafdb0b7a8 WHIRLPOOL e3f6810bad330d8601ce03a5aaff024f36cf76d20da29e50eea567eff4b13176abe692a28761babb8396d98d36c1d18434c9fc7eb0b716e074c6e46a954fc280 +EBUILD cairo-1.12.16-r4.ebuild 5973 SHA256 9c36ff2e509a87e97d4b548c970aaa72b025ddd4fce5d17d1873cec5225af1ff SHA512 4a41eee6c4393acd7a254c1771fdaa869e12c090163e1eff94f8dbdacd7cc3bf7fcf6937752a0c89562f722fd556d40dea84b3c95a04867fba6f7376c50f5edc WHIRLPOOL 56e9a98044d602489574895ada56909c85153057cb84280abdf60a828ff9fa46fcaee35ffe37e976070d6359af1c3485478c7196612cdeb7f2d9b06d0364b45c EBUILD cairo-1.12.16.ebuild 4115 SHA256 510a7314d31ee86b1cdc198cc2feae538b577582961b38c1bcab35e8e8da1a17 SHA512 a7964920b7dc9b8fcd3826207fa53046e41d67d3486a73f32cd4183ebf2d9ac500398a0d73604c9d234139344653d66ad8b24eb91e1d48d814c1fa70ba179c29 WHIRLPOOL 1df6b4bae51c564a862e763b0ffb6726ce9ab983bf7fe353e7bfb8f34d32cdd56a2c889efc55d70174061a0b3d8744ef9abb282870e6bae4d119b9331841a40d EBUILD cairo-1.12.18.ebuild 5345 SHA256 5e533cf8c9fbdcf0d0f0332dce8745eceec3d1b21548715e9d661aea9986675e SHA512 7cae826aa5968f6c28aada62929dd06a78b179877dad7dbff4779dc04a01c6942abcaf9081634b5988dfbadc78f6a951c7ec5d7092243890fed3efeedfeacd22 WHIRLPOOL 24a02da763a50c1f1d1bda1f1fa0fac7f9b8e2981a49ba45a3e53e8baf9d52c69fc32f297b05fec50a4631df42d4f7bf60b404cc0351c2ccbd3e3384f9df1dfb EBUILD cairo-9999.ebuild 5343 SHA256 87169f9c915e502c88f35a5ad27b2b11427dfcf9ceed65080b8a2776d7605e07 SHA512 fba2d79bbf0ca5c5dbda679749f84f0ac15393ed0a722879c9efc8b56324d56ad9fe9bcf5373bad976b0156869b5a1d6b17172517cea038d22b820c69b3e5c26 WHIRLPOOL 0a06ab612b60a6e37ed89d3117ca0db450c113e7f820caae4e1609c3d0d522884096d5bdf04f8612c43266498378f426b4de2cc75660834258360e53bd0b3a86 -MISC ChangeLog 58833 SHA256 49c11262f30989c8c1013845b63ea86493c1e10fbf20c8b1f103c8ff782387b5 SHA512 bb9d5946f113ec9f5d345cec1a68adc3c123e8abea84535d7d517f2ecf8dbc7cfbeefa69e1da7667c6837164ed3ce44f80f60cb1a080907bcbe920dd8fd434ce WHIRLPOOL f09616b23da01eb238a54b039a04bb1010e7962c01f8c3ebca096673dbd9c5fbb72340032c01c4d23c96f10f7cbd9694d446170ee9b9bcbcdf0572732e8faaa4 +MISC ChangeLog 59052 SHA256 1feb0a15a217384e205b668d572a2e0df66bcb4308669b28a6dc892dd4f98c3a SHA512 fea608daaa0f8d91544289c2eb8826f4db55371aa59527c832aabb2d86db86989594a26d91baecc5059c632346e05a0d95e0ded15f9d30b9f46a0cdaafdf9ad3 WHIRLPOOL b97dbf0dc2446f3256d357746ee0d328f88057113c11518ce57632795b95aa801d934f585127791e1ce7bc015c9467040be30942a97c04778a8a4f0255123ea1 MISC metadata.xml 1512 SHA256 e608340ec4a70a7ed36558825b916661bc659e8e8b588a89c2b94f57fb62822e SHA512 616bfa3ee0b43f91d9104f19e756e97a2e68edc65b2eb293864d15a099068e3f5359f0edaf91fff5a2470b82d303d37e4227a7df65b3f3601362f1268501f94f WHIRLPOOL 8e279a5124dd7073add02094a5363046d47e435b4e274a765cb936d33599cf13e16758fe3f57ef316a8137dd574681a99d4b5bf8074554606d7d36afadaa3f91 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUi2MfAAoJEA/daC2XTKcqvXsP/iaQFZ8kIxfwlMpjH/HICxoX -2QJsovCQu/3cBG51lWadJRoIAnnrK+hSeliMIRzNza4r1CwRz/7q+zCHN/d89Itc -N25uLp+b+0DT9Wsy58/XL3p2hSkFMGxw4JErDwGGMp9PlKMQEoYexRwFSoh5HuCs -EyNj4mtjxzgMQ1eRz/WAsAvyhh8BJL4oWLURFTKoXmY/c3o8z+SPw3A38D1+Yaxa -2cJ3aPuc+Q8Cq8X2pgC941T3O6nwbkGAnRRheTKva0KQHRho4ZCtpcEnRzE1ZXPC -sena0MqqdoORkPK2g+YB1VauHczkFL9hEQKRf5V6UhHLLlFv8IArkFsPI5MmEZ0K -68DeN2lJGugHxJOml49Gu6S4Z5S4yFJuBbHh25V9dwB/yUSMINVsxYG/drqmJjAs -AgHunuut1W2w3eoW9una08WS5UVbd5QvHQq8cqZNkeq5UgOr1tdAOh/4ciT4+5KB -baQGtFH8+pO6OpFJnqbqHPdYgKzvNdrTxdJkrM0z+H8jl6V7I0sfsZFHoPQdZBRc -ZT4r1NPSEpFuoJU3J0jty2rjBv6PQ6mCb9gjDbz4B4Y4LgD6GzS3ytBwoy1K70QJ -Kwmmw7UQvKyUzHv55aSg7eNACrdwblV3fcdgynnED+Rv4BSKXEdmiY8txVc9ujyq -MGgN5io8RYVheP8bKBit -=xsKF +iQJ8BAEBCABmBQJUmd4vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOSe8P/jcA8IsfrPQz9iCArlI4oh87 +UcT9twWdJPx29hGQV3I7aEh93xLnPw6h52SaRHLF1Rk1KjQh/QUUyXQ4JddzYSrQ +Nw0tJ/tn7ZXwIG4jjcs4qHLoljaAEuYPzPQ3U4bnB+H7tVLUXtT02/zRxY8uA0aY +hQl/P0n+TItMFGpJjH3ywZBAw5mSxFndBfPas7rMDhK1+m38ZlgTmaY8P7IBio7Y +5l9Gsx9OjP36c2f4P17vtsW8DBaW7oa+hei0reYXRQ1dtvCgTTqKSu8i72zJyD3y +KNaZbrzK8upqlruseOxevz0E75Pycv7fn/Z3+T6Nk72aSDEqwxQrm2gJOfKU7/EF +dmRE9fgUP5q7QnjU7B6yfE1auhd4SIfr7ry2KtxYjmhoT5aodzc0qFq3nT8Dp2hA +KxPfsRrFJR2dHKogCO+m9OVmNy9xXdjA5RhgJLbKHhk/V7+emrxIZHKLAeqGgTsc +5cvNZjQsY+NMf8DyQuoWg5dZ/TIugZkLp16IGS5IVw4FSAJL80PKSZXsSlESzFfW +VbJp+D5BqLv5OAutWuKZDhqL3A6XuH+UpOV6SefgRaFrVVfoIaF8HeAwfcmUm7hS +Z/qDeQnlkeRa0jTarDAVHLvnsd3aSqXpFs4LLnjCnqCn5+abZZK0J1+OEgBKZf9e +eKc6lAuhGEU9JA4z9Zrx +=a0AB -----END PGP SIGNATURE----- diff --git a/x11-libs/cairo/cairo-1.12.16-r3.ebuild b/x11-libs/cairo/cairo-1.12.16-r3.ebuild index ea5ebb01273d..8e641d48103e 100644 --- a/x11-libs/cairo/cairo-1.12.16-r3.ebuild +++ b/x11-libs/cairo/cairo-1.12.16-r3.ebuild @@ -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 @@ DESCRIPTION="A vector graphics library with cross-device output support" 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 @@ MULTILIB_WRAPPED_HEADERS=( /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 @@ multilib_src_configure() { $(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 @@ multilib_src_configure() { --enable-pdf \ --enable-png \ --enable-ps \ + --disable-lto \ ${myopts} } diff --git a/x11-libs/cairo/cairo-1.12.16-r4.ebuild b/x11-libs/cairo/cairo-1.12.16-r4.ebuild index 41d55363e5ad..a7daef93ebfb 100644 --- a/x11-libs/cairo/cairo-1.12.16-r4.ebuild +++ b/x11-libs/cairo/cairo-1.12.16-r4.ebuild @@ -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 @@ DESCRIPTION="A vector graphics library with cross-device output support" 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 @@ MULTILIB_WRAPPED_HEADERS=( /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 @@ multilib_src_configure() { $(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 @@ multilib_src_configure() { --enable-pdf \ --enable-png \ --enable-ps \ + --disable-lto \ ${myopts} }