Cleanup: better handling of -Werror and system zlib. Check success of

setting CFLAGS in include.gypi.
Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index a46ee872bf55c53122d63ba1c55cd7965eca524f..4dd8e7cd6798cf84e0dae1331a6392a9859dc873 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -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@gentoo.org>
+  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)
 

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index f8922b8d024346fba8ecb83a6dfc6c42725dd2a6..837994c3fc3e18303612fb7e39f85a72bb1a7180 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -12,8 +12,8 @@ DIST chromium-5.0.342.9.tar.bz2 155586284 RMD160 5ab3df8b19383c21d6279a96aa2e0c2
 DIST chromium-5.0.375.23.tar.bz2 161814334 RMD160 139573ba251c4e1a99b0649091b0d52b9553322e SHA1 78bdf22b065bc7da56534f1f0d5d1356694fb260 SHA256 145341c01f81bd64f6ff3e9f762c1aff46206f714d81b3fab7ef8bd178e00140
 DIST chromium-5.0.375.9.tar.bz2 248611435 RMD160 5fdf9ed277f0464ec4b925b3047658cca4d2120a SHA1 3277a872eb8ffe04b61f301136c9600671be15e7 SHA256 13cf5a64a414c2b3cec33735efbac0c23131607fcd37d5b9bb9ec1c9ec8481bd
 EBUILD chromium-5.0.342.9.ebuild 6548 RMD160 abb9d41541d252a60a61641ea76f6f7b1298bbcf SHA1 7f4e1c7f970b8f7a50247f27ca89bda3f064bb2a SHA256 6845b8905a1376ba8ec24ea09276d05b89d3b3c4da136d385260a4170b9e9d29
-EBUILD chromium-5.0.375.23.ebuild 6441 RMD160 79a90ad24594d2c3c17f170b7e6e9b60c31eefaa SHA1 9e08e2fa6a19919425c0b8e25f48ab5d91825b09 SHA256 e6e2f4d46f0a9a26825d3bcf9ef0a226ecc5eafc576dcddc4698f6563c93e40f
+EBUILD chromium-5.0.375.23.ebuild 6436 RMD160 d0d01d6761e605408d9d3bc07f66b33dc3f4407b SHA1 2eda56005b7f6b465497f62f548ab251d2a41f6b SHA256 504816c00293dab6da66b27740a7710fcb0328f6a0162176dd68757e0a773721
 EBUILD chromium-5.0.375.9.ebuild 6589 RMD160 1888aebc34e494b2bd640a970dbad4da615f4613 SHA1 3e1b189006d98fbfb677cad8db0da5743ff82180 SHA256 5bcc45d7f187ab3cc5ac247f4d2e6d604ce80f7069b71e2e0467a9fab7797f3a
-EBUILD chromium-9999.ebuild 8193 RMD160 49ca85aa7d1d01051cfd64a58c33aa270c5f88b1 SHA1 442c6f5a07e7666811ea05d4abd8b06b7e4ec7cd SHA256 778737030ac7d8a12597a71199ab7aaea6cae96f2939365002316590261f9e20
-MISC ChangeLog 20939 RMD160 cdfcb00f7fbd616ee98e2b076bba694665f6ca3a SHA1 84f8b6880b7cd02f8ee68323876ae35e0be92d61 SHA256 cc30c23159ac94ab1f194f2ff1cda5fd87e1bc65463e3417faff15fa176bfdba
+EBUILD chromium-9999.ebuild 8188 RMD160 f1b4996bbfc913311b20059fc089fd5936fe8d7a SHA1 bb8ee50ad2880ab0e3399ecf1fb34bfd93cd40a6 SHA256 29da4d65eb20f75d3de9071cfb5df7907f43d5c4a07150689e78c0548413fb89
+MISC ChangeLog 21153 RMD160 b2ee549dc80cd714f5edfea76ad936da87b4f06b SHA1 452080fb5798109e7f7a0cfc3b5c45b7119acb7e SHA256 e3ee53c29b2a123ec395cfa25e50685aa09fc6612d4f386df62647916003a107
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5

diff --git a/www-client/chromium/chromium-5.0.375.23.ebuild b/www-client/chromium/chromium-5.0.375.23.ebuild
index cfb81bfc304fb9f6562a6afd0b1b4c5f9b960ff1..8f17598aa16e255479bd58ba4ec3d35a93a2130f 100644 (file)
--- a/www-client/chromium/chromium-5.0.375.23.ebuild
+++ b/www-client/chromium/chromium-5.0.375.23.ebuild
@@ -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 @@ pkg_setup() {
 }
 
 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 @@ src_prepare() {
 
        # 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 @@ src_configure() {
        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 @@ EOF
                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"
 }
 

diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index dfe43b59d91b2ea1c08dc3bce19e1ad86199ac84..9ca0cfc4c92f8bb29685f1e289656b209231a813 100644 (file)
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -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_unpack() {
 }
 
 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 @@ src_prepare() {
 
        # 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 @@ src_configure() {
        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 @@ EOF
                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"
 }