| 1 |
commit: d2fc70e31198b9b280b0dc017e36da6a06a090dd |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 1 19:35:35 2013 +0000 |
| 4 |
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 1 19:35:35 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d2fc70e3 |
| 7 |
|
| 8 |
net-libs/webkit-gtk: sync debugging flags check with gx86 |
| 9 |
|
| 10 |
Raise build space requirements to 18GB (bug #417307) and replace -ggdb with -g |
| 11 |
(bug #432784). |
| 12 |
|
| 13 |
--- |
| 14 |
net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild | 28 +++++++++++++++------ |
| 15 |
1 files changed, 20 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild |
| 18 |
index aa2db30..65ec3a7 100644 |
| 19 |
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild |
| 20 |
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2012 Gentoo Foundation |
| 23 |
+# Copyright 1999-2013 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
@@ -75,21 +75,33 @@ DEPEND="${RDEPEND} |
| 28 |
|
| 29 |
S="${WORKDIR}/${MY_P}" |
| 30 |
|
| 31 |
-CHECKREQS_DISK_BUILD="6G" |
| 32 |
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 |
| 33 |
|
| 34 |
pkg_pretend() { |
| 35 |
- if is-flagq "-g*" ; then |
| 36 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then |
| 37 |
+ einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" |
| 38 |
check-reqs_pkg_pretend |
| 39 |
fi |
| 40 |
} |
| 41 |
|
| 42 |
pkg_setup() { |
| 43 |
# Check whether any of the debugging flags is enabled |
| 44 |
- if is-flagq "-g*" ; then |
| 45 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" ; then |
| 46 |
+ if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then |
| 47 |
+ replace-flags -ggdb -g |
| 48 |
+ ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS." |
| 49 |
+ ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too" |
| 50 |
+ ewarn "large for current binutils releases (bug #432784) and has very" |
| 51 |
+ ewarn "high temporary build space and memory requirements." |
| 52 |
+ ewarn "If you really want to build ${PN} with \"-ggdb\", add" |
| 53 |
+ ewarn "WEBKIT_GTK_GGDB=yes" |
| 54 |
+ ewarn "to your make.conf file." |
| 55 |
+ fi |
| 56 |
+ einfo "You need to have at least 18GB of temporary build space available" |
| 57 |
+ einfo "to build ${PN} with debugging CFLAGS. Note that it might still" |
| 58 |
+ einfo "not be enough, as the total space requirements depend on the flags" |
| 59 |
+ einfo "(-ggdb vs -g1) and enabled features." |
| 60 |
check-reqs_pkg_setup |
| 61 |
- einfo "You have at least 6GB of temporary build space available, but " |
| 62 |
- einfo "it may still not be enough, as the total space requirements " |
| 63 |
- einfo "depends on the debugging flags (-ggdb vs -g1) and enabled features." |
| 64 |
fi |
| 65 |
} |
| 66 |
|
| 67 |
@@ -172,7 +184,7 @@ src_configure() { |
| 68 |
# XXX: Check Web Audio support |
| 69 |
# XXX: dependency-tracking is required so parallel builds won't fail |
| 70 |
# XXX: There's 3 acceleration backends: opengl, egl and gles2 |
| 71 |
- # should somehow let user select between them? |
| 72 |
+ # should somehow let user select between them? |
| 73 |
myconf=" |
| 74 |
$(use_enable coverage) |
| 75 |
$(use_enable debug) |
Archives