From: "Alexandre Rostovtsev (tetromino)" <tetromino@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk: ChangeLog webkit-gtk-1.10.2-r300.ebuild webkit-gtk-2.0.4.ebuild webkit-gtk-1.8.3-r200.ebuild webkit-gtk-1.8.3-r201.ebuild webkit-gtk-1.8.3-r300.ebuild
Date: Thu, 10 Oct 2013 23:43:21 +0000 (UTC) [thread overview]
Message-ID: <20131010234321.1D1282004C@flycatcher.gentoo.org> (raw)
tetromino 13/10/10 23:43:21
Modified: ChangeLog webkit-gtk-1.10.2-r300.ebuild
webkit-gtk-2.0.4.ebuild
webkit-gtk-1.8.3-r200.ebuild
webkit-gtk-1.8.3-r201.ebuild
webkit-gtk-1.8.3-r300.ebuild
Log:
Refuse to build if nvidia-drivers-325.* is the being used as the system opengl library to avoid freeze while compiling (bug #463960, thanks to Harris Landgarten, nE0sIghT and others for help in diagnosing the issue).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Revision Changes Path
1.224 net-libs/webkit-gtk/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.224&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.224&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.223&r2=1.224
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- ChangeLog 4 Oct 2013 00:19:14 -0000 1.223
+++ ChangeLog 10 Oct 2013 23:43:20 -0000 1.224
@@ -1,6 +1,14 @@
# 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.223 2013/10/04 00:19:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.224 2013/10/10 23:43:20 tetromino Exp $
+
+ 10 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+ webkit-gtk-1.8.3-r200.ebuild, webkit-gtk-1.8.3-r201.ebuild,
+ webkit-gtk-1.8.3-r300.ebuild, webkit-gtk-1.10.2-r300.ebuild,
+ webkit-gtk-2.0.4.ebuild:
+ Refuse to build if nvidia-drivers-325.* is the being used as the system
+ opengl library to avoid freeze while compiling (bug #463960, thanks to Harris
+ Landgarten, nE0sIghT and others for help in diagnosing the issue).
04 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
webkit-gtk-1.10.2-r300.ebuild:
1.14 net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild?r1=1.13&r2=1.14
Index: webkit-gtk-1.10.2-r300.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- webkit-gtk-1.10.2-r300.ebuild 4 Oct 2013 00:19:14 -0000 1.13
+++ webkit-gtk-1.10.2-r300.ebuild 10 Oct 2013 23:43:20 -0000 1.14
@@ -1,6 +1,6 @@
# 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.10.2-r300.ebuild,v 1.13 2013/10/04 00:19:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v 1.14 2013/10/10 23:43:20 tetromino Exp $
EAPI="5"
@@ -81,6 +81,8 @@
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
pkg_pretend() {
+ nvidia_check || die #463960
+
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
check-reqs_pkg_pretend
@@ -88,6 +90,8 @@
}
pkg_setup() {
+ nvidia_check || die #463960
+
# Check whether any of the debugging flags is enabled
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
@@ -272,3 +276,20 @@
# Prevents crashes on PaX systems
use jit && pax-mark m "${ED}usr/bin/jsc-3"
}
+
+nvidia_check() {
+ if [[ ${MERGE_TYPE} != "binary" ]] &&
+ use introspection &&
+ has_version '=x11-drivers/nvidia-drivers-325*' &&
+ [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
+ then
+ eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
+ eerror "used as the system OpenGL library."
+ eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
+ eerror "Mesa as the system OpenGL library:"
+ eerror " # eselect opengl set xorg-x11"
+ eerror "See https://bugs.gentoo.org/463960 for more details."
+ eerror
+ return 1
+ fi
+}
1.6 net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild?r1=1.5&r2=1.6
Index: webkit-gtk-2.0.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- webkit-gtk-2.0.4.ebuild 1 Oct 2013 23:39:17 -0000 1.5
+++ webkit-gtk-2.0.4.ebuild 10 Oct 2013 23:43:20 -0000 1.6
@@ -1,6 +1,6 @@
# 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-2.0.4.ebuild,v 1.5 2013/10/01 23:39:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild,v 1.6 2013/10/10 23:43:20 tetromino Exp $
EAPI="5"
@@ -89,6 +89,8 @@
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
pkg_pretend() {
+ nvidia_check || die #463960
+
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
check-reqs_pkg_pretend
@@ -100,6 +102,8 @@
}
pkg_setup() {
+ nvidia_check || die #463960
+
# Check whether any of the debugging flags is enabled
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
@@ -253,3 +257,20 @@
# Prevents crashes on PaX systems
use jit && pax-mark m "${ED}usr/bin/jsc-3"
}
+
+nvidia_check() {
+ if [[ ${MERGE_TYPE} != "binary" ]] &&
+ use introspection &&
+ has_version '=x11-drivers/nvidia-drivers-325*' &&
+ [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
+ then
+ eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
+ eerror "used as the system OpenGL library."
+ eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
+ eerror "Mesa as the system OpenGL library:"
+ eerror " # eselect opengl set xorg-x11"
+ eerror "See https://bugs.gentoo.org/463960 for more details."
+ eerror
+ return 1
+ fi
+}
1.14 net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild?r1=1.13&r2=1.14
Index: webkit-gtk-1.8.3-r200.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- webkit-gtk-1.8.3-r200.ebuild 5 Sep 2013 19:01:33 -0000 1.13
+++ webkit-gtk-1.8.3-r200.ebuild 10 Oct 2013 23:43:20 -0000 1.14
@@ -1,6 +1,6 @@
# 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.13 2013/09/05 19:01:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild,v 1.14 2013/10/10 23:43:20 tetromino Exp $
EAPI="4"
@@ -72,6 +72,8 @@
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
pkg_pretend() {
+ nvidia_check || die #463960
+
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
check-reqs_pkg_pretend
@@ -79,6 +81,8 @@
}
pkg_setup() {
+ nvidia_check || die #463960
+
# Check whether any of the debugging flags is enabled
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
@@ -259,3 +263,20 @@
# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
rm -rf "${ED}usr/share/gtk-doc" || die
}
+
+nvidia_check() {
+ if [[ ${MERGE_TYPE} != "binary" ]] &&
+ use introspection &&
+ has_version '=x11-drivers/nvidia-drivers-325*' &&
+ [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
+ then
+ eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
+ eerror "used as the system OpenGL library."
+ eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
+ eerror "Mesa as the system OpenGL library:"
+ eerror " # eselect opengl set xorg-x11"
+ eerror "See https://bugs.gentoo.org/463960 for more details."
+ eerror
+ return 1
+ fi
+}
1.13 net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild?r1=1.12&r2=1.13
Index: webkit-gtk-1.8.3-r201.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- webkit-gtk-1.8.3-r201.ebuild 5 Sep 2013 19:01:33 -0000 1.12
+++ webkit-gtk-1.8.3-r201.ebuild 10 Oct 2013 23:43:20 -0000 1.13
@@ -1,6 +1,6 @@
# 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-r201.ebuild,v 1.12 2013/09/05 19:01:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild,v 1.13 2013/10/10 23:43:20 tetromino Exp $
EAPI=5
@@ -72,6 +72,8 @@
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
pkg_pretend() {
+ nvidia_check || die #463960
+
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
check-reqs_pkg_pretend
@@ -79,6 +81,8 @@
}
pkg_setup() {
+ nvidia_check || die #463960
+
# Check whether any of the debugging flags is enabled
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
@@ -266,3 +270,20 @@
# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
rm -rf "${ED}usr/share/gtk-doc" || die
}
+
+nvidia_check() {
+ if [[ ${MERGE_TYPE} != "binary" ]] &&
+ use introspection &&
+ has_version '=x11-drivers/nvidia-drivers-325*' &&
+ [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
+ then
+ eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
+ eerror "used as the system OpenGL library."
+ eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
+ eerror "Mesa as the system OpenGL library:"
+ eerror " # eselect opengl set xorg-x11"
+ eerror "See https://bugs.gentoo.org/463960 for more details."
+ eerror
+ return 1
+ fi
+}
1.14 net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild?r1=1.13&r2=1.14
Index: webkit-gtk-1.8.3-r300.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- webkit-gtk-1.8.3-r300.ebuild 5 Sep 2013 19:01:33 -0000 1.13
+++ webkit-gtk-1.8.3-r300.ebuild 10 Oct 2013 23:43:20 -0000 1.14
@@ -1,6 +1,6 @@
# 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.13 2013/09/05 19:01:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v 1.14 2013/10/10 23:43:20 tetromino Exp $
EAPI="4"
@@ -78,6 +78,8 @@
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
pkg_pretend() {
+ nvidia_check || die #463960
+
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
check-reqs_pkg_pretend
@@ -85,6 +87,8 @@
}
pkg_setup() {
+ nvidia_check || die #463960
+
# Check whether any of the debugging flags is enabled
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
@@ -270,3 +274,20 @@
# Prevents crashes on PaX systems
use jit && pax-mark m "${ED}usr/bin/jsc-3"
}
+
+nvidia_check() {
+ if [[ ${MERGE_TYPE} != "binary" ]] &&
+ use introspection &&
+ has_version '=x11-drivers/nvidia-drivers-325*' &&
+ [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
+ then
+ eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
+ eerror "used as the system OpenGL library."
+ eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
+ eerror "Mesa as the system OpenGL library:"
+ eerror " # eselect opengl set xorg-x11"
+ eerror "See https://bugs.gentoo.org/463960 for more details."
+ eerror
+ return 1
+ fi
+}
reply other threads:[~2013-10-10 23:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131010234321.1D1282004C@flycatcher.gentoo.org \
--to=tetromino@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox