* [gentoo-commits] gentoo-x86 commit in www-client/chromium: chromium-8.0.552.18.ebuild metadata.xml ChangeLog chromium-9999.ebuild
@ 2010-10-29 8:52 PaweA Hajdan (phajdan.jr)
0 siblings, 0 replies; only message in thread
From: PaweA Hajdan (phajdan.jr) @ 2010-10-29 8:52 UTC (permalink / raw
To: gentoo-commits
phajdan.jr 10/10/29 08:52:07
Modified: chromium-8.0.552.18.ebuild metadata.xml ChangeLog
chromium-9999.ebuild
Log:
Add experimental support for building with system-provided v8.
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.2 www-client/chromium/chromium-8.0.552.18.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-8.0.552.18.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-8.0.552.18.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-8.0.552.18.ebuild?r1=1.1&r2=1.2
Index: chromium-8.0.552.18.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-8.0.552.18.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chromium-8.0.552.18.ebuild 27 Oct 2010 08:41:21 -0000 1.1
+++ chromium-8.0.552.18.ebuild 29 Oct 2010 08:52:07 -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-8.0.552.18.ebuild,v 1.1 2010/10/27 08:41:21 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-8.0.552.18.ebuild,v 1.2 2010/10/29 08:52:07 phajdan.jr Exp $
EAPI="2"
@@ -13,12 +13,13 @@
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite"
+IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite system-v8"
RDEPEND="app-arch/bzip2
system-sqlite? (
>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
)
+ system-v8? ( ~dev-lang/v8-2.4.9.6 )
>=dev-libs/icu-4.4.1
>=dev-libs/libevent-1.4.13
dev-libs/libxml2
@@ -54,7 +55,7 @@
remove_bundled_lib() {
einfo "Removing bundled library $1 ..."
local out
- out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \
+ out="$(find $1 -type f \! -iname '*.gyp' -print -delete)" \
|| die "failed to remove bundled library $1"
if [[ -z $out ]]; then
die "no files matched when removing bundled library $1"
@@ -100,6 +101,21 @@
remove_bundled_lib "third_party/sqlite/src"
remove_bundled_lib "third_party/sqlite/preprocessed"
fi
+
+ if use system-v8; then
+ # Provide our own gyp file that links with the system v8.
+ # TODO: move this upstream.
+ cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die
+
+ remove_bundled_lib "v8"
+
+ # The implementation files include v8 headers with full path,
+ # like #include "v8/include/v8.h". Make sure the system headers
+ # will be used.
+ # TODO: find a solution that can be upstreamed.
+ rmdir v8/include || die
+ ln -s /usr/include v8/include || die
+ fi
}
src_configure() {
1.11 www-client/chromium/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/metadata.xml?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/metadata.xml?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/metadata.xml?r1=1.10&r2=1.11
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/metadata.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- metadata.xml 9 Oct 2010 14:00:14 -0000 1.10
+++ metadata.xml 29 Oct 2010 08:52:07 -0000 1.11
@@ -8,5 +8,7 @@
<pkg>www-plugins/gecko-mediaplayer</pkg></flag>
<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
installation with secure-delete enabled</flag>
+ <flag name="system-v8">Use the system-wide <pkg>dev-lang/v8</pkg>
+ installation</flag>
</use>
</pkgmetadata>
1.210 www-client/chromium/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.210&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.210&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.209&r2=1.210
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- ChangeLog 27 Oct 2010 14:20:22 -0000 1.209
+++ ChangeLog 29 Oct 2010 08:52:07 -0000 1.210
@@ -1,6 +1,10 @@
# 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.209 2010/10/27 14:20:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.210 2010/10/29 08:52:07 phajdan.jr Exp $
+
+ 29 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> +files/v8.gyp,
+ chromium-8.0.552.18.ebuild, chromium-9999.ebuild, metadata.xml:
+ Add experimental support for building with system-provided v8.
27 Oct 2010; Bernard Cafarelli <voyageur@gentoo.org> chromium-9999.ebuild:
Drop icu patch, merged upstream, thanks Keith Rusler
1.98 www-client/chromium/chromium-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.97&r2=1.98
Index: chromium-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- chromium-9999.ebuild 27 Oct 2010 14:20:22 -0000 1.97
+++ chromium-9999.ebuild 29 Oct 2010 08:52:07 -0000 1.98
@@ -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.97 2010/10/27 14:20:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.98 2010/10/29 08:52:07 phajdan.jr Exp $
EAPI="2"
@@ -15,12 +15,13 @@
LICENSE="BSD"
SLOT="0"
KEYWORDS=""
-IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite"
+IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite system-v8"
RDEPEND="app-arch/bzip2
system-sqlite? (
>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
)
+ system-v8? ( ~dev-lang/v8-2.4.9.6 )
>=dev-libs/icu-4.4.1
>=dev-libs/libevent-1.4.13
dev-libs/libxml2
@@ -99,7 +100,7 @@
remove_bundled_lib() {
einfo "Removing bundled library $1 ..."
local out
- out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \
+ out="$(find $1 -type f \! -iname '*.gyp' -print -delete)" \
|| ewarn "failed to remove bundled library $1"
if [[ -z $out ]]; then
ewarn "no files matched when removing bundled library $1"
@@ -141,6 +142,21 @@
remove_bundled_lib "third_party/sqlite/src"
remove_bundled_lib "third_party/sqlite/preprocessed"
fi
+
+ if use system-v8; then
+ # Provide our own gyp file that links with the system v8.
+ # TODO: move this upstream.
+ cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die
+
+ remove_bundled_lib "v8"
+
+ # The implementation files include v8 headers with full path,
+ # like #include "v8/include/v8.h". Make sure the system headers
+ # will be used.
+ # TODO: find a solution that can be upstreamed.
+ rmdir v8/include || die
+ ln -s /usr/include v8/include || die
+ fi
}
src_configure() {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-10-29 8:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-29 8:52 [gentoo-commits] gentoo-x86 commit in www-client/chromium: chromium-8.0.552.18.ebuild metadata.xml ChangeLog chromium-9999.ebuild PaweA Hajdan (phajdan.jr)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox