diff options
author | 2013-01-01 19:26:01 +0000 | |
---|---|---|
committer | 2013-01-01 19:26:01 +0000 | |
commit | 01b91fc848a15c16813fc4912e362e1552fc8a38 (patch) | |
tree | 14088fc91709ee221e9192e3109b7840a1552318 /net-libs | |
parent | s390/sh stable wrt #446094 (diff) | |
download | historical-01b91fc848a15c16813fc4912e362e1552fc8a38.tar.gz historical-01b91fc848a15c16813fc4912e362e1552fc8a38.tar.bz2 historical-01b91fc848a15c16813fc4912e362e1552fc8a38.zip |
Add webkit-gtk-1.10's build space check to 1.8.3.
Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'net-libs')
-rw-r--r-- | net-libs/webkit-gtk/ChangeLog | 6 | ||||
-rw-r--r-- | net-libs/webkit-gtk/Manifest | 20 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild | 33 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild | 33 |
4 files changed, 75 insertions, 17 deletions
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog index 7228777910fc..70a070970ebe 100644 --- a/net-libs/webkit-gtk/ChangeLog +++ b/net-libs/webkit-gtk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/webkit-gtk # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.189 2013/01/01 19:15:10 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.190 2013/01/01 19:25:56 tetromino Exp $ + + 01 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org> + webkit-gtk-1.8.3-r200.ebuild, webkit-gtk-1.8.3-r300.ebuild: + Add webkit-gtk-1.10's build space check to 1.8.3. 01 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org> webkit-gtk-1.10.2-r300.ebuild: diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index f6c9bbd609dc..dc29005dad3c 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -32,18 +32,18 @@ DIST webkitgtk-1.10.2.tar.xz 8633640 SHA256 19234f8e4edfaefe91ed06471a2aa8c71d26 EBUILD webkit-gtk-1.10.2-r300.ebuild 7798 SHA256 36ea9f834bc7b7fc0f2e7658f5221ef5dd59097f3389676c9b837cf95b92c4e8 SHA512 0f9ec9489e9c7b5e7c5c275003c100f2e5fc7541db63bccd6fbdd262813650b97fa1b8072cebc614965066fddafe067cdc07911010b2cced7258bd34bc36c26a WHIRLPOOL 0ef7341c5497b2dbe4bbbb246b577a80abc90131d6ed084c58a9b9cd987add3b5bdc5c8ff14dfa155ec0691285a3a4827bf851881c27ffa109dec2378c2da7c7 EBUILD webkit-gtk-1.6.3-r200.ebuild 5289 SHA256 06a0faa00c6e78e389b20e67030fdb2823824e7157d6763101414c6b18785dca SHA512 fc5990313a20077f09c0ac1e38081d4f7726ad945ec2f6f2f2389cfa0608b280bf650ca6a25468640246899233cef0262304bdf3c9aeb82566e934fe2c7e1ea6 WHIRLPOOL 3fac714d69b35af4129cb996a50551dc24c4a4d99a13e1508a57718b47ec16eed4558e58831f1b9ae946b98a746cd9cf2ea052f584c587c34b022b27c3522010 EBUILD webkit-gtk-1.6.3-r300.ebuild 5117 SHA256 7902abf3fcc751c43f69810ab23cfb175e6a8594e202dc2c58cc03d37a687aff SHA512 2e873508f04a0ae34e31eb0a3d34597c0f37d9c7e9c566164bccf4ee1305625a5ce947bfa04ec5d9174a8dfe2d49e38dcecf220a95df3a265d28ac038760700d WHIRLPOOL 146b0af488b45663a785ebfa6867ada3e2134af80a8af509f5d33f4ed04d050bea52ba61177f004211c9608e60d8e168bfdbd4ab8a2a340b23adfd413c7d157b -EBUILD webkit-gtk-1.8.3-r200.ebuild 7367 SHA256 272d6c8e8c30269e0a72fb241daea179ba3a0d32f186ccc036d99db6945b979e SHA512 5c9208c6da4a80cf6ba46a94d77332d23d63e959a073ed1a9daf952a7816fc54a09c02e8231536f7df5bac3716a3c1fcbe6a56129bf0d0019e9679cb4eda4cb3 WHIRLPOOL ea98ad0a3cb9f9f5036aae0a94e10ebe5815efbef7c94633f0f253b7bed1b4bc2a1931f36eb32d90502c6a6fd1acb56497773eb24aaccd177b38c6daabab0894 -EBUILD webkit-gtk-1.8.3-r300.ebuild 7783 SHA256 ebdcd75a41edde7ba13a802acad8fdc63969de568d573de1f08f9742f73f09bb SHA512 e2a6463a2724888224872b1d3293f3e633aacee995a94ba886e8190e9ceabc915b45d170fe338db8884b409c88b6ce64b7811208dc10341e74bac5e5f3489168 WHIRLPOOL 0f50cf9c3f5a83848ad1ac4cf59a0f7640bdd073f85d074fe5089ab00641dcbb719cc89dc4ae91519fe9e76780b41953889cb66d06292fa8715e92ceebf4f3b6 -MISC ChangeLog 626 SHA256 8ee56d7c496ffb4dc1c1c38290eb25cbcbdf5948ef622a1b1debeb44a91b1e3c SHA512 5ca8096454608aca15e5da6e3fe15a178d5a426e139de55dd766c2d02bb65ed1add5bd7ee6660542558aa1168ce248bff0c4b02d602115c46a65f207e2406f60 WHIRLPOOL 7e5ed8b641b968cbb3d60d085318b5f2303095ca8821ca655ac43cc031a8f4fc015b06132f12776d13538263748ac689f45851e97c4e50cd60ae9a778d321b86 +EBUILD webkit-gtk-1.8.3-r200.ebuild 8565 SHA256 3b4c4fbfd9c39c52e799468c3577c6f7436bf780226536fcfa555dedc6c6b3ad SHA512 19f6c370c64d5f0c96c75d7095ab0eec08843615e6098188d32229d77ed33e325f0f2f30a113a332c98afa056ddafea5f7d8836a9ec056ff0e3f145b55fd7d65 WHIRLPOOL b4fc8b15950b8aa5910b375a73edec7409066a654aefda6744f6b9f2c83cd1eb6a89665ef01f232812ff2712d0f49f03d24d8cefa201fbbf7d2edbf691223c8a +EBUILD webkit-gtk-1.8.3-r300.ebuild 8981 SHA256 5eb79284a24d39ea02ec7dff7ca3ab5cc294236f5f2081a762e8cef677b8f95c SHA512 eef010560195e1532f12721e0dd2f3abc32c6a3cf69960cebb917532cec1a917bc26865559965db8e21ad54bd011d7abb16d50920a71408a14b68666d92a07f7 WHIRLPOOL 824204597020337c4254c9ca9b6350b7afc8c4b11e6ad2143b8691ac12fdf6be516990c6a7ddc807b2906efb3774497af7f8eb3e9e7cafd2319dc1ed4d285989 +MISC ChangeLog 800 SHA256 31b68bd15bb1146ddcf21800c8e3f0efe21376fd830a3fd7b3612d7917a2ee8d SHA512 fe5d626726ebcef300a85cb27aeafa986c3cb9c99d2f0519cb807d684dab18709ec40c1988b0d5a0397dd12130607bdbcae47775f49f6ade7e4ef51b88ce861d WHIRLPOOL ef087492b860480c9baafaaa18e458c38d4bf9614d83f3b8216763fbb5592c20b11145d518742bd3a8f58a514b68912fc41ca61d5e9adb2723efb71dcd672595 MISC metadata.xml 558 SHA256 18f1557aa99ae463f768111d8e2cdd1a9eb973dec36f2322b2c32aec98ee5efe SHA512 526ca4a587a80575bd14c39c0129712d5f7a50ca487a3518ca9e3ab7bb88bed5169e4695dd9a2bcafcc89af9788510a05ba043b5db537424ce450e988dc3ec54 WHIRLPOOL cf51ac43e0bbac4181b1e33bf10cf724a079dcfb735d6462cbb426b1247e1b9ae491edf46346723168f61ee9aa8afd02b70beea920c5a2d1d24b6fe967a2dcf8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQ4zW/AAoJEJ0WA1zPCt1hE2oH/ioCy75cESlW6WaKF+l+l1t/ -MWJmgohkNpk0jHeSxpWzsAyKRRGC1qCTniNSrOf6YvbsnnXJao2KHPnJhh/mY2ae -dXt3pN7cWEEE43CJCSc4mtfs85ivowgNNsFO1OVJSa3f5gJ+FECTmcYa6Rix0KGF -+5dAkAkyknx0x0JmVokaxO04i178Ldt8DKW7vmWh4oeCwFQeWkL3o26+pNwkrWb6 -+uRIsayO2RUNLYGVjjpNkcBSYoyJj26UZQl8aquWGu+hgW3fQMqUTbsTH01pM0eo -O0cmYNK886m+GzsAWP8sk+2+4F3EGX3bsDLfk4j3Y38tVMFeqQUUnlihserRNYI= -=H4F7 +iQEcBAEBCAAGBQJQ4zhFAAoJEJ0WA1zPCt1hvEAH/116EnAKsn3WjHskpVO4945r +n7sT0kayjsIIK2I8mQMKWG2t9zmLOXhQ5zEBgQ9HiFC8wwhl+4Hd5isumib6z2uN +bO7eJygEuVs/QfTGjheEf6X3V4tKxyrO+IZMl2a9HyzmQ2c/PLczSctmc4H7zbjC +2eYsOaI5afh22Io/nuvkeSz+J6eXiRb9RpMkujJ5Pe2AgBz4dBPcRGbMAGiU+8hg +A8NQBQcgaWVqUVkSwtbJ5y4RAz5K7SP6HuCP/DPrdFk0TNgz3k/vC4zlgKrnxVSu +sDjsDrJsF5xDPM7ah2Nak8NGtsDSOCPxrjXalbVNpJGc73pWX2WfejwvEEkV0kU= +=Si/D -----END PGP SIGNATURE----- diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild index 4104cb6cbffe..a8aa53d182bb 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild,v 1.9 2012/12/08 21:35:36 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild,v 1.10 2013/01/01 19:25:56 tetromino Exp $ EAPI="4" # Don't define PYTHON_DEPEND: python only needed at build time -inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx +inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python virtualx MY_P="webkit-${PV}" DESCRIPTION="Open source web browser engine" @@ -65,7 +65,34 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi +} + pkg_setup() { + # Check whether any of the debugging flags is enabled + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then + if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then + replace-flags -ggdb -g + ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS." + ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too" + ewarn "large for current binutils releases (bug #432784) and has very" + ewarn "high temporary build space and memory requirements." + ewarn "If you really want to build ${PN} with \"-ggdb\", add" + ewarn "WEBKIT_GTK_GGDB=yes" + ewarn "to your make.conf file." + fi + einfo "You need to have at least 18GB of temporary build space available" + einfo "to build ${PN} with debugging CFLAGS. Note that it might still" + einfo "not be enough, as the total space requirements depend on the flags" + einfo "(-ggdb vs -g1) and enabled features." + check-reqs_pkg_setup + fi # Needed for CodeGeneratorInspector.py python_set_active_version 2 python_pkg_setup diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild index e883b20b8653..a40dea543a4b 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v 1.9 2012/12/08 21:40:08 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v 1.10 2013/01/01 19:25:56 tetromino Exp $ EAPI="4" # Don't define PYTHON_DEPEND: python only needed at build time -inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx +inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python virtualx MY_P="webkit-${PV}" DESCRIPTION="Open source web browser engine" @@ -72,7 +72,34 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi +} + pkg_setup() { + # Check whether any of the debugging flags is enabled + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then + if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then + replace-flags -ggdb -g + ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS." + ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too" + ewarn "large for current binutils releases (bug #432784) and has very" + ewarn "high temporary build space and memory requirements." + ewarn "If you really want to build ${PN} with \"-ggdb\", add" + ewarn "WEBKIT_GTK_GGDB=yes" + ewarn "to your make.conf file." + fi + einfo "You need to have at least 18GB of temporary build space available" + einfo "to build ${PN} with debugging CFLAGS. Note that it might still" + einfo "not be enough, as the total space requirements depend on the flags" + einfo "(-ggdb vs -g1) and enabled features." + check-reqs_pkg_setup + fi # Needed for CodeGeneratorInspector.py python_set_active_version 2 python_pkg_setup |