[gentoo-commits] gentoo-x86 commit in www-client/chromium: ChangeLog chromium-5.0.375.23.ebuild chromium-9999.ebuild

[PaweA Hajdan (phajdan.jr)]

phajdan.jr    10/04/29 10:48:09

  Modified:             ChangeLog chromium-5.0.375.23.ebuild
                        chromium-9999.ebuild
  Log:
  Cleanup: better handling of -Werror and system zlib. Check success of
  setting CFLAGS in include.gypi.
  (Portage version: 2.1.8.3/cvs/Linux i686)

Revision  Changes    Path
1.92                 www-client/chromium/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?r1=1.91&r2=1.92

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ChangeLog	28 Apr 2010 13:12:17 -0000	1.91
+++ ChangeLog	29 Apr 2010 10:48:09 -0000	1.92
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.91 2010/04/28 13:12:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.92 2010/04/29 10:48:09 phajdan.jr Exp $
+
+  29 Apr 2010; Pawel Hajdan jr <phajdan.jr@g.o>
+  chromium-5.0.375.23.ebuild, chromium-9999.ebuild:
+  Cleanup: better handling of -Werror and system zlib. Check success of
+  setting CFLAGS in include.gypi.
 
 *chromium-5.0.375.23 (28 Apr 2010)
 



1.2                  www-client/chromium/chromium-5.0.375.23.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.375.23.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.375.23.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.375.23.ebuild?r1=1.1&r2=1.2

Index: chromium-5.0.375.23.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.23.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chromium-5.0.375.23.ebuild	28 Apr 2010 13:12:18 -0000	1.1
+++ chromium-5.0.375.23.ebuild	29 Apr 2010 10:48:09 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.23.ebuild,v 1.1 2010/04/28 13:12:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.23.ebuild,v 1.2 2010/04/29 10:48:09 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -74,9 +74,6 @@
 }
 
 src_prepare() {
-	# Changing this in ~/include.gypi does not work
-	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
-
 	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
 	epatch "${FILESDIR}"/${PN}-drop_sse2-r0.patch
 
@@ -85,11 +82,6 @@
 
 	# Fix build failure with libpng-1.4, bug 310959.
 	epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
-
-	# Disable prefixing to allow linking against system zlib
-	sed -e '/^#include "mozzconf.h"$/d' \
-		-i third_party/zlib/zconf.h \
-		|| die "zlib sed failed"
 }
 
 src_configure() {
@@ -107,8 +99,8 @@
 	fi
 
 	# CFLAGS/LDFLAGS
-	mkdir -p "${S}"/.gyp
-	cat << EOF > "${S}"/.gyp/include.gypi
+	mkdir -p "${S}"/.gyp || die "cflags mkdir failed"
+	cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed"
 {
 	'target_defaults': {
 		'cflags': [ '${CFLAGS// /','}' ],
@@ -148,6 +140,11 @@
 		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
 	fi
 
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf="${myconf} -Dwerror="
+
 	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
 }
 



1.47                 www-client/chromium/chromium-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.46&r2=1.47

Index: chromium-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- chromium-9999.ebuild	20 Apr 2010 07:55:14 -0000	1.46
+++ chromium-9999.ebuild	29 Apr 2010 10:48:09 -0000	1.47
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.46 2010/04/20 07:55:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.47 2010/04/29 10:48:09 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
@@ -119,9 +119,6 @@
 }
 
 src_prepare() {
-	# Changing this in ~/include.gypi does not work
-	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
-
 	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
 	epatch "${FILESDIR}"/${PN}-drop_sse2-r1.patch
 
@@ -130,11 +127,6 @@
 
 	# Fix build failure with libpng-1.4, bug 310959.
 	epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
-
-	# Disable prefixing to allow linking against system zlib
-	sed -e '/^#include "mozzconf.h"$/d' \
-		-i third_party/zlib/zconf.h \
-		|| die "zlib sed failed"
 }
 
 src_configure() {
@@ -151,8 +143,8 @@
 	fi
 
 	# CFLAGS/LDFLAGS
-	mkdir -p "${S}"/.gyp
-	cat << EOF > "${S}"/.gyp/include.gypi
+	mkdir -p "${S}"/.gyp || die "cflags mkdir failed"
+	cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed"
 {
 	'target_defaults': {
 		'cflags': [ '${CFLAGS// /','}' ],
@@ -192,6 +184,11 @@
 		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
 	fi
 
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf="${myconf} -Dwerror="
+
 	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
 }