chrome/installer/linux/debian/build.sh - Issue 385693002: Split linux library expectations for debian into 32 and 64 bit, remove libgcc1 from 64 after clang …

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: chrome/installer/linux/debian/build.sh

Issue 385693002: Split linux library expectations for debian into 32 and 64 bit, remove libgcc1 from 64 after clang … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/installer/linux/debian/build.sh

diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh

index 9431844dc48800d57f677bf6408976b770549a1b..9f5c02ca3b0615e3487cb22e8875676eb8356150 100755

--- a/chrome/installer/linux/debian/build.sh

+++ b/chrome/installer/linux/debian/build.sh

@@ -275,12 +275,13 @@ echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | \

# Compare the expected dependency list to the generate list.

BAD_DIFF=0

-diff "$SCRIPTDIR/expected_deps" actual || BAD_DIFF=1

+diff "$SCRIPTDIR/expected_deps_$TARGETARCH" actual || BAD_DIFF=1

if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then

echo

echo "ERROR: Shared library dependencies changed!"

echo "If this is intentional, please update:"

- echo "chrome/installer/linux/debian/expected_deps"

+ echo "chrome/installer/linux/debian/expected_deps_ia32"

Lei Zhang 2014/07/10 18:07:42 maybe just expected_deps_$TARGETARCH here?

Nico 2014/07/10 18:08:29 Dunno, this is what the rpm script does. Seems lik

+ echo "chrome/installer/linux/debian/expected_deps_x64"

echo

exit $BAD_DIFF

« no previous file with comments | « no previous file | chrome/installer/linux/debian/expected_deps » ('j') | no next file with comments »