Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(249)

Unified Diff: build/install-chroot.sh

Issue 3775010: Detect available lib64readline version before trying to install in chroot. (Closed)
Patch Set: review cleanups Created 10 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/install-chroot.sh
diff --git a/build/install-chroot.sh b/build/install-chroot.sh
index 65bda044122cb9c2e30c2708369980dabf5790f7..194c0d6a15d1f68d28f65f592dd0f76c22436bca 100755
--- a/build/install-chroot.sh
+++ b/build/install-chroot.sh
@@ -256,8 +256,10 @@ sudo schroot -c "${target%bit}" -p -- apt-get -y install \
# If running a 32bit environment on a 64bit machine, install a few binaries
# as 64bit.
if [ "${arch}" = 32bit ] && file /bin/bash 2>/dev/null | grep -q x86-64; then
+ readlinepkg=$(sudo schroot -c "${target%bit}" -p -- sh -c \
+ 'apt-cache search "lib64readline.\$" | sort | tail -n 1 | cut -d " " -f 1')
sudo schroot -c "${target%bit}" -p -- apt-get -y install \
- lib64expat1 lib64ncurses5 lib64readline6 lib64z1
+ lib64expat1 lib64ncurses5 ${readlinepkg} lib64z1
dep=
for i in binutils gdb strace; do
[ -d /usr/share/doc/"$i" ] || dep="$dep $i"
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698