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

Side by Side Diff: build/install-build-deps.sh

Issue 14166013: Fixed a bug that was introduced when we started deprecating 32bit libraries on 64bit systems. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rewrapped Created 7 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash -e 1 #!/bin/bash -e
2 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Script to install everything needed to build chromium (well, ideally, anyway) 7 # Script to install everything needed to build chromium (well, ideally, anyway)
8 # See http://code.google.com/p/chromium/wiki/LinuxBuildInstructions 8 # See http://code.google.com/p/chromium/wiki/LinuxBuildInstructions
9 # and http://code.google.com/p/chromium/wiki/LinuxBuild64Bit 9 # and http://code.google.com/p/chromium/wiki/LinuxBuild64Bit
10 10
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 290
291 # Install 32bit backwards compatibility support for 64bit systems 291 # Install 32bit backwards compatibility support for 64bit systems
292 if [ "$(uname -m)" = "x86_64" ]; then 292 if [ "$(uname -m)" = "x86_64" ]; then
293 if test "$do_inst_lib32" != "1" 293 if test "$do_inst_lib32" != "1"
294 then 294 then
295 echo "NOTE: If you were expecting the option to install 32bit libs," 295 echo "NOTE: If you were expecting the option to install 32bit libs,"
296 echo "please run with the --lib32 flag." 296 echo "please run with the --lib32 flag."
297 echo 297 echo
298 echo "Installation complete." 298 echo "Installation complete."
299 exit 0 299 exit 0
300 else
301 # This conditional statement has been added to deprecate and eventually
302 # remove support for 32bit libraries on 64bit systems. But for the time
303 # being, we still have to support a few legacy systems (e.g. bots), where
304 # this feature is needed.
305 # We only even give the user the option to install these libraries, if
306 # they explicitly requested doing so by setting the --lib32 command line
307 # flag.
308 # And even then, we interactively ask them one more time whether they are
309 # absolutely sure.
310 # In order for that to work, we must reset the ${do_inst_lib32} variable.
311 # There are other ways to achieve the same goal. But resetting the
312 # variable is the best way to document the intended behavior -- and to
313 # allow us to gradually deprecate and then remove the obsolete code.
Peter Mayo 2013/09/26 17:53:15 Ignoring the --no_prompt option? The "special" bo
314 do_inst_lib32=
300 fi 315 fi
301 316
302 echo "WARNING" 317 echo "WARNING"
303 echo 318 echo
304 echo "We no longer recommend that you use this script to install" 319 echo "We no longer recommend that you use this script to install"
305 echo "32bit libraries on a 64bit system. Instead, consider using the" 320 echo "32bit libraries on a 64bit system. Instead, consider using the"
306 echo "install-chroot.sh script to help you set up a 32bit environment" 321 echo "install-chroot.sh script to help you set up a 32bit environment"
307 echo "for building and testing 32bit versions of Chrome." 322 echo "for building and testing 32bit versions of Chrome."
308 echo 323 echo
309 echo "The code for installing 32bit libraries on a 64bit system is" 324 echo "The code for installing 32bit libraries on a 64bit system is"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 sed -e 's/[.]so[.][0-9].*/.so/' | 489 sed -e 's/[.]so[.][0-9].*/.so/' |
475 sort -u); do 490 sort -u); do
476 [ "x${i##*/}" = "xld-linux.so" ] && continue 491 [ "x${i##*/}" = "xld-linux.so" ] && continue
477 [ -r "$i" ] && continue 492 [ -r "$i" ] && continue
478 j="$(ls "$i."* | sed -e 's/.*[.]so[.]\([^.]*\)$/\1/;t;d' | 493 j="$(ls "$i."* | sed -e 's/.*[.]so[.]\([^.]*\)$/\1/;t;d' |
479 sort -n | tail -n 1)" 494 sort -n | tail -n 1)"
480 [ -r "$i.$j" ] || continue 495 [ -r "$i.$j" ] || continue
481 sudo ln -s "${i##*/}.$j" "$i" 496 sudo ln -s "${i##*/}.$j" "$i"
482 done 497 done
483 fi 498 fi
OLDNEW
« 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