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

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

Issue 7326019: Updated gold to 2.21.1 and removed the patching for the older version of Gold. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/build/
Patch Set: Created 9 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 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) 2011 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2011 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 28 matching lines...) Expand all
39 # First make sure root can access this directory, as that's tripped 39 # First make sure root can access this directory, as that's tripped
40 # up some folks. 40 # up some folks.
41 if sudo touch xyz.$$ 41 if sudo touch xyz.$$
42 then 42 then
43 sudo rm xyz.$$ 43 sudo rm xyz.$$
44 else 44 else
45 echo root cannot write to the current directory, not installing gold 45 echo root cannot write to the current directory, not installing gold
46 return 46 return
47 fi 47 fi
48 48
49 BINUTILS=binutils-2.21 49 BINUTILS=binutils-2.21.1
50 BINUTILS_URL=http://ftp.gnu.org/gnu/binutils/$BINUTILS.tar.bz2 50 BINUTILS_URL=http://ftp.gnu.org/gnu/binutils/$BINUTILS.tar.bz2
51 BINUTILS_SHA1=ef93235588eb443e4c4a77f229a8d131bccaecc6 51 BINUTILS_SHA1=a22801a9cad45c85e9ff6afc10537d72
52 52
53 test -f $BINUTILS.tar.bz2 || wget $BINUTILS_URL 53 test -f $BINUTILS.tar.bz2 || wget $BINUTILS_URL
54 if test "`sha1sum $BINUTILS.tar.bz2|cut -d' ' -f1`" != "$BINUTILS_SHA1" 54 if test "`sha1sum $BINUTILS.tar.bz2|cut -d' ' -f1`" != "$BINUTILS_SHA1"
55 then 55 then
56 echo Bad sha1sum for $BINUTILS.tar.bz2 56 echo Bad sha1sum for $BINUTILS.tar.bz2
57 exit 1 57 exit 1
58 fi 58 fi
59 59
60 tar -xjvf $BINUTILS.tar.bz2 60 tar -xjvf $BINUTILS.tar.bz2
61 cd $BINUTILS 61 cd $BINUTILS
62 patch -p1 <<EOF
63 diff -u -r1.103 -r1.103.2.1
64 --- src/gold/object.h 2010/09/08 23:54:51 1.103
65 +++ src/gold/object.h 2011/02/10 01:15:28 1.103.2.1
66 @@ -1,6 +1,6 @@
67 // object.h -- support for an object file for linking in gold -*- C++ -*-
68
69 -// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
70 +// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
71 // Written by Ian Lance Taylor <iant@google.com>.
72
73 // This file is part of gold.
74 @@ -2165,15 +2165,6 @@
75 Output_symtab_xindex*,
76 Output_symtab_xindex*);
77
78 - // Clear the local symbol information.
79 - void
80 - clear_local_symbols()
81 - {
82 - this->local_values_.clear();
83 - this->local_got_offsets_.clear();
84 - this->local_plt_offsets_.clear();
85 - }
86 -
87 // Record a mapping from discarded section SHNDX to the corresponding
88 // kept section.
89 void
90 diff -u -r1.60 -r1.60.2.1
91 --- src/gold/reloc.cc 2010/10/14 22:10:22 1.60
92 +++ src/gold/reloc.cc 2011/02/10 01:15:28 1.60.2.1
93 @@ -1,6 +1,6 @@
94 // reloc.cc -- relocate input files for gold.
95
96 -// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
97 +// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
98 // Written by Ian Lance Taylor <iant@google.com>.
99
100 // This file is part of gold.
101 @@ -685,9 +685,6 @@
102 // Write out the local symbols.
103 this->write_local_symbols(of, layout->sympool(), layout->dynpool(),
104 layout->symtab_xindex(), layout->dynsym_xindex());
105 -
106 - // We should no longer need the local symbol values.
107 - this->clear_local_symbols();
108 }
109
110 // Sort a Read_multiple vector by file offset.
111 EOF
112 ./configure --prefix=/usr/local/gold --enable-gold --enable-threads 62 ./configure --prefix=/usr/local/gold --enable-gold --enable-threads
113 make maybe-all-binutils maybe-all-gold -j4 63 make maybe-all-binutils maybe-all-gold -j4
114 if sudo make maybe-install-binutils maybe-install-gold 64 if sudo make maybe-install-binutils maybe-install-gold
115 then 65 then
116 # Still need to figure out graceful way of pointing gyp to use 66 # Still need to figure out graceful way of pointing gyp to use
117 # /usr/local/gold/bin/ld without requiring him to set environment 67 # /usr/local/gold/bin/ld without requiring him to set environment
118 # variables. That will go into bootstrap-linux.sh when it's ready. 68 # variables. That will go into bootstrap-linux.sh when it's ready.
119 echo "Installing gold as /usr/bin/ld." 69 echo "Installing gold as /usr/bin/ld."
120 echo "To uninstall, do 'cd /usr/bin; sudo rm ld; sudo mv ld.orig ld'" 70 echo "To uninstall, do 'cd /usr/bin; sudo rm ld; sudo mv ld.orig ld'"
121 test -f /usr/bin/ld && test ! -f /usr/bin/ld.orig && \ 71 test -f /usr/bin/ld && test ! -f /usr/bin/ld.orig && \
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 sed -e 's/[.]so[.][0-9].*/.so/' | 453 sed -e 's/[.]so[.][0-9].*/.so/' |
504 sort -u); do 454 sort -u); do
505 [ "x${i##*/}" = "xld-linux.so" ] && continue 455 [ "x${i##*/}" = "xld-linux.so" ] && continue
506 [ -r "$i" ] && continue 456 [ -r "$i" ] && continue
507 j="$(ls "$i."* | sed -e 's/.*[.]so[.]\([^.]*\)$/\1/;t;d' | 457 j="$(ls "$i."* | sed -e 's/.*[.]so[.]\([^.]*\)$/\1/;t;d' |
508 sort -n | tail -n 1)" 458 sort -n | tail -n 1)"
509 [ -r "$i.$j" ] || continue 459 [ -r "$i.$j" ] || continue
510 sudo ln -s "${i##*/}.$j" "$i" 460 sudo ln -s "${i##*/}.$j" "$i"
511 done 461 done
512 fi 462 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