diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2009-12-15 14:05:25 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2009-12-15 14:05:25 +0000 |
| commit | ea96f7da20ad9e6558672160c3b662ccf3eeeb43 (patch) | |
| tree | 0825933a5fc1c33b78d344b573b92b2f471313ba /www-client | |
| parent | Version bumped. Added qt3support, bug #296507. (diff) | |
| download | gentoo-2-ea96f7da20ad9e6558672160c3b662ccf3eeeb43.tar.gz gentoo-2-ea96f7da20ad9e6558672160c3b662ccf3eeeb43.tar.bz2 gentoo-2-ea96f7da20ad9e6558672160c3b662ccf3eeeb43.zip | |
multilib cleanups, thanks to ferret <ferret@explodingferret.com> in bug #296917
(Portage version: 2.2_rc59/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/chromium/chromium-4.0.266.0.ebuild | 14 | ||||
| -rw-r--r-- | www-client/chromium/chromium-9999.ebuild | 18 |
3 files changed, 28 insertions, 11 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 53c204325135..d8f592813583 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/chromium # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.30 2009/12/08 12:14:48 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.31 2009/12/15 14:05:25 voyageur Exp $ + + 15 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org> + chromium-4.0.266.0.ebuild, chromium-9999.ebuild: + multilib cleanups, thanks to ferret <ferret@explodingferret.com> in bug + #296917 *chromium-4.0.266.0 (08 Dec 2009) diff --git a/www-client/chromium/chromium-4.0.266.0.ebuild b/www-client/chromium/chromium-4.0.266.0.ebuild index 2f9d5ab275ee..1a2b9c3bbe0a 100644 --- a/www-client/chromium/chromium-4.0.266.0.ebuild +++ b/www-client/chromium/chromium-4.0.266.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0.ebuild,v 1.1 2009/12/08 12:14:48 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0.ebuild,v 1.2 2009/12/15 14:05:25 voyageur Exp $ EAPI="2" inherit eutils multilib toolchain-funcs @@ -34,8 +34,6 @@ DEPEND="${RDEPEND} >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23" -export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser - src_prepare() { # Gentoo uses .kde4, not .kde sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \ @@ -54,6 +52,8 @@ src_prepare() { } src_configure() { + export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser + # CFLAGS/LDFLAGS mkdir -p "${S}"/.gyp cat << EOF > "${S}"/.gyp/include.gypi @@ -74,9 +74,14 @@ EOF # Sandbox paths myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - if use amd64; then + if [[ "$ABI" == "amd64" ]] ; then myconf="${myconf} -Dtarget_arch=x64" fi + + if [[ "$ABI" == "x86" ]] ; then + myconf="${myconf} -Dtarget_arch=ia32" + fi + if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" fi @@ -96,6 +101,7 @@ src_compile() { src_install() { # Chromium does not have "install" target in the build system. + export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser dodir ${CHROMIUM_HOME} diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild index 692a26d32b49..2ce7d0423d7e 100644 --- a/www-client/chromium/chromium-9999.ebuild +++ b/www-client/chromium/chromium-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.11 2009/12/02 17:14:31 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.12 2009/12/15 14:05:25 voyageur Exp $ EAPI="2" inherit eutils multilib toolchain-funcs subversion @@ -35,8 +35,6 @@ DEPEND="${RDEPEND} >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23" -export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser - src_unpack() { subversion_src_unpack mv "${S}" "${WORKDIR}"/depot_tools @@ -98,6 +96,8 @@ src_prepare() { } src_configure() { + export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser + # CFLAGS/LDFLAGS mkdir -p "${S}"/.gyp cat << EOF > "${S}"/.gyp/include.gypi @@ -118,9 +118,14 @@ EOF # Sandbox paths myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - if use amd64; then + if [[ "$ABI" == "amd64" ]] ; then myconf="${myconf} -Dtarget_arch=x64" fi + + if [[ "$ABI" == "x86" ]] ; then + myconf="${myconf} -Dtarget_arch=ia32" + fi + if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" fi @@ -140,6 +145,7 @@ src_compile() { src_install() { # Chromium does not have "install" target in the build system. + export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser dodir ${CHROMIUM_HOME} @@ -157,8 +163,8 @@ src_install() { doins -r out/Release/resources # chrome.1 is for chromium --help - newman out/Release/chromium-browser.1 chrome.1 - newman out/Release/chromium-browser.1 chromium.1 + newman out/Release/chrome.1 chrome.1 + newman out/Release/chrome.1 chromium.1 if use ffmpeg; then # Chromium looks for these in its folder |