diff options
| author |   Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-08-11 00:03:16 +0000 |
|---|---|---|
| committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-08-11 00:03:16 +0000 |
| commit | 2752ad3b45e9566a26728125de4dc564a25167d8 (patch) | |
| tree | 9808ed24991f1ec11a359bc971904d359f5e1b16 /www-client/chromium | |
| parent | Fix thunderbird patchset so it can be found, thanks Cardoe (diff) | |
| download | gentoo-2-2752ad3b45e9566a26728125de4dc564a25167d8.tar.gz gentoo-2-2752ad3b45e9566a26728125de4dc564a25167d8.tar.bz2 gentoo-2-2752ad3b45e9566a26728125de4dc564a25167d8.zip | |
Fix compile with make-3.82, bug #332131 by polynomial-c.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'www-client/chromium')
| -rw-r--r-- | www-client/chromium/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/chromium/chromium-6.0.472.25-r1.ebuild | 5 | ||||
| -rw-r--r-- | www-client/chromium/chromium-9999.ebuild | 5 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-make-3.82-compatibility-r0.patch | 20 |
4 files changed, 34 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 01d2fbaeda94..697261f3df2a 100644 --- 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.152 2010/08/10 19:36:59 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.153 2010/08/11 00:03:15 phajdan.jr Exp $ + + 11 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> + +files/chromium-make-3.82-compatibility-r0.patch, + chromium-6.0.472.25-r1.ebuild, chromium-9999.ebuild: + Fix compile with make-3.82, bug #332131 by polynomial-c. 10 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-6.0.472.25-r1.ebuild, chromium-9999.ebuild: diff --git a/www-client/chromium/chromium-6.0.472.25-r1.ebuild b/www-client/chromium/chromium-6.0.472.25-r1.ebuild index 0aab0438a380..a3f6c7617e03 100644 --- a/www-client/chromium/chromium-6.0.472.25-r1.ebuild +++ b/www-client/chromium/chromium-6.0.472.25-r1.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-6.0.472.25-r1.ebuild,v 1.2 2010/08/10 19:36:59 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild,v 1.3 2010/08/11 00:03:15 phajdan.jr Exp $ EAPI="2" @@ -59,6 +59,9 @@ remove_bundled_lib() { } src_prepare() { + # Fix compilation, bug #332131. + epatch "${FILESDIR}"/${PN}-make-3.82-compatibility-r0.patch + remove_bundled_lib "third_party/bzip2" remove_bundled_lib "third_party/codesighs" remove_bundled_lib "third_party/cros" diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild index cf5a3e7ab825..0808a7b18f21 100644 --- 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.72 2010/08/10 19:36:59 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.73 2010/08/11 00:03:15 phajdan.jr Exp $ EAPI="2" @@ -105,6 +105,9 @@ remove_bundled_lib() { } src_prepare() { + # Fix compilation, bug #332131. + epatch "${FILESDIR}"/${PN}-make-3.82-compatibility-r0.patch + remove_bundled_lib "third_party/bzip2" remove_bundled_lib "third_party/codesighs" remove_bundled_lib "third_party/cros" diff --git a/www-client/chromium/files/chromium-make-3.82-compatibility-r0.patch b/www-client/chromium/files/chromium-make-3.82-compatibility-r0.patch new file mode 100644 index 000000000000..bf3f062eeeb6 --- /dev/null +++ b/www-client/chromium/files/chromium-make-3.82-compatibility-r0.patch @@ -0,0 +1,20 @@ +--- tools/gyp/pylib/gyp/generator/make.py.orig 2010-08-10 23:58:52.000000000 +0200 ++++ tools/gyp/pylib/gyp/generator/make.py 2010-08-11 00:00:15.000000000 +0200 +@@ -656,7 +656,7 @@ + part_of_all: flag indicating this target is part of 'all' + """ + for action in actions: +- name = self.target + '_' + action['action_name'] ++ name = self.target + '_' + action['action_name'].replace(' ', '_') + self.WriteLn('### Rules for action "%s":' % action['action_name']) + inputs = action['inputs'] + outputs = action['outputs'] +@@ -725,7 +725,7 @@ + part_of_all: flag indicating this target is part of 'all' + """ + for rule in rules: +- name = self.target + '_' + rule['rule_name'] ++ name = self.target + '_' + rule['rule_name'].replace(' ', '_') + count = 0 + self.WriteLn('### Generated for rule %s:' % name) + |