build/install-build-deps.sh - Issue 1108173002: Roll //build, //native_client, and a few more targets of opportunity.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/install-build-deps.sh

Issue 1108173002: Roll //build, //native_client, and a few more targets of opportunity. Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Test fix Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/install-build-deps.sh

diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh

index 53d9712a6ee5267c9cb38ec3cf6406424f7c6edd..6473794ddd522a403ef84947af2c5de3b26e847a 100755

--- a/build/install-build-deps.sh

+++ b/build/install-build-deps.sh

@@ -155,6 +155,12 @@ arm_list="libc6-dev-armhf-cross

linux-libc-dev-armhf-cross

g++-arm-linux-gnueabihf"

+# Work around for dependency issue Ubuntu/Trusty: http://crbug.com/435056

+if [ "x$lsb_release" = "xtrusty" ]; then

+ arm_list+=" g++-4.8-multilib-arm-linux-gnueabihf

+ gcc-4.8-multilib-arm-linux-gnueabihf"

+fi

# Packages to build NaCl, its toolchains, and its ports.

naclports_list="ant autoconf bison cmake gawk intltool xutils-dev xsltproc"

nacl_list="g++-mingw-w64-i686 lib32z1-dev

@@ -360,7 +366,7 @@ if test "$do_inst_lib32" = "1" || test "$do_inst_nacl" = "1"; then

sudo dpkg --add-architecture i386

-#sudo apt-get update

+sudo apt-get update

# We initially run "apt-get" with the --reinstall option and parse its output.

# This way, we can find all the packages that need to be newly installed

« no previous file with comments | « build/host_jar.gypi ('k') | build/ios/grit_whitelist.txt » ('j') | no next file with comments »