|
Lines 15-21
Link Here
|
| 15 |
LICENSE="BSD" |
15 |
LICENSE="BSD" |
| 16 |
SLOT="live" |
16 |
SLOT="live" |
| 17 |
KEYWORDS="" |
17 |
KEYWORDS="" |
| 18 |
IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio" |
18 |
IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos +nacl pulseaudio" |
| 19 |
|
19 |
|
| 20 |
# en_US is ommitted on purpose from the list below. It must always be available. |
20 |
# en_US is ommitted on purpose from the list below. It must always be available. |
| 21 |
LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr |
21 |
LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr |
|
Lines 55-61
Link Here
|
| 55 |
x11-libs/libXtst |
55 |
x11-libs/libXtst |
| 56 |
kerberos? ( virtual/krb5 )" |
56 |
kerberos? ( virtual/krb5 )" |
| 57 |
DEPEND="${RDEPEND} |
57 |
DEPEND="${RDEPEND} |
|
|
58 |
nacl? ( |
| 58 |
>=dev-lang/nacl-toolchain-newlib-0_p7311 |
59 |
>=dev-lang/nacl-toolchain-newlib-0_p7311 |
|
|
60 |
) |
| 59 |
dev-lang/perl |
61 |
dev-lang/perl |
| 60 |
dev-lang/yasm |
62 |
dev-lang/yasm |
| 61 |
dev-python/simplejson |
63 |
dev-python/simplejson |
|
Lines 129-134
Link Here
|
| 129 |
elog "Installing/updating to version ${MAJOR}.${MINOR}.${BUILD}.${PATCH} (Developer Build ${ESVN_WC_REVISION})" |
131 |
elog "Installing/updating to version ${MAJOR}.${MINOR}.${BUILD}.${PATCH} (Developer Build ${ESVN_WC_REVISION})" |
| 130 |
} |
132 |
} |
| 131 |
|
133 |
|
|
|
134 |
REQUIRED_USE=" |
| 135 |
arm? ( !nacl ) |
| 136 |
" |
| 137 |
|
| 132 |
gyp_use() { |
138 |
gyp_use() { |
| 133 |
if [[ $# -lt 2 ]]; then |
139 |
if [[ $# -lt 2 ]]; then |
| 134 |
echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2 |
140 |
echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2 |
|
Lines 237-244
Link Here
|
| 237 |
} |
243 |
} |
| 238 |
|
244 |
|
| 239 |
src_prepare() { |
245 |
src_prepare() { |
|
|
246 |
if use nacl; then |
| 240 |
ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \ |
247 |
ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \ |
| 241 |
native_client/toolchain/linux_x86_newlib || die |
248 |
native_client/toolchain/linux_x86_newlib || die |
|
|
249 |
fi |
| 242 |
|
250 |
|
| 243 |
# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371. |
251 |
# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371. |
| 244 |
sed -i '1i#define OF(x) x' \ |
252 |
sed -i '1i#define OF(x) x' \ |
|
Lines 349-354
Link Here
|
| 349 |
$(gyp_use gnome-keyring use_gnome_keyring) |
357 |
$(gyp_use gnome-keyring use_gnome_keyring) |
| 350 |
$(gyp_use gnome-keyring linux_link_gnome_keyring) |
358 |
$(gyp_use gnome-keyring linux_link_gnome_keyring) |
| 351 |
$(gyp_use kerberos use_kerberos) |
359 |
$(gyp_use kerberos use_kerberos) |
|
|
360 |
$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi) |
| 352 |
$(gyp_use pulseaudio use_pulseaudio)" |
361 |
$(gyp_use pulseaudio use_pulseaudio)" |
| 353 |
|
362 |
|
| 354 |
# Enable sandbox. |
363 |
# Enable sandbox. |
|
Lines 386-392
Link Here
|
| 386 |
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. |
395 |
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. |
| 387 |
append-flags -fno-tree-sink |
396 |
append-flags -fno-tree-sink |
| 388 |
|
397 |
|
| 389 |
myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" |
398 |
myconf+=" -Dtarget_arch=arm -Dlinux_use_tcmalloc=0" |
| 390 |
else |
399 |
else |
| 391 |
die "Failed to determine target arch, got '$myarch'." |
400 |
die "Failed to determine target arch, got '$myarch'." |
| 392 |
fi |
401 |
fi |
|
Lines 460-465
Link Here
|
| 460 |
|
469 |
|
| 461 |
# Install Native Client files on platforms that support it. |
470 |
# Install Native Client files on platforms that support it. |
| 462 |
insinto "${CHROMIUM_HOME}" |
471 |
insinto "${CHROMIUM_HOME}" |
|
|
472 |
if use nacl; then |
| 463 |
case "$(tc-arch)" in |
473 |
case "$(tc-arch)" in |
| 464 |
amd64) |
474 |
amd64) |
| 465 |
doexe out/Release/nacl_helper{,_bootstrap} || die |
475 |
doexe out/Release/nacl_helper{,_bootstrap} || die |
|
Lines 472-477
Link Here
|
| 472 |
doins out/Release/libppGoogleNaClPluginChrome.so || die |
482 |
doins out/Release/libppGoogleNaClPluginChrome.so || die |
| 473 |
;; |
483 |
;; |
| 474 |
esac |
484 |
esac |
|
|
485 |
fi |
| 475 |
|
486 |
|
| 476 |
newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die |
487 |
newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die |
| 477 |
if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then |
488 |
if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then |
