Change scripts/common.sh to allow the users build Valgrind binaries from the ...

scripts/common.sh

 #!/bin/sh
 
 # Copyright (c) 2009-2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script contains some functions useful to build
 # Valgrind and ThreadSanitizer for use with chromium
 
 THISDIR=$(dirname "${0}")
 THISDIR=$(cd "${THISDIR}" && /bin/pwd)
 
+system_is_snow_leopard() {
+  uname -r | grep 10\.[0-9]\.[0-9] >/dev/null
+}
+
 checkout_and_patch_valgrind() {
   # $1 = Valgrind revision
   # $2 = VEX revision
   # $3 = source dir
   # Checkout Valgrind, apply our patches to Valgrind.
   # The source will be put in $THISDIR/valgrind-source
   cd $THISDIR
   VG_REV="$1"
   VEX_REV="$2"
   SOURCE_DIR="$3"
 
+  if system_is_snow_leopard
+  then
+    SVN_URI="svn://svn.valgrind.org/valgrind/branches/MACOSX106"
+  else
+    SVN_URI="svn://svn.valgrind.org/valgrind/trunk"
+  fi
+
   test -d "$SOURCE_DIR" && rm -rf "$SOURCE_DIR"
   mkdir "$SOURCE_DIR"
 
   # Check out latest version that following patches known to apply against
-  svn co -r "$VG_REV" "svn://svn.valgrind.org/valgrind/trunk" "$SOURCE_DIR"
+  svn co -r "$VG_REV" "$SVN_URI" "$SOURCE_DIR"
 
   cd "$SOURCE_DIR"
   # Make sure svn gets the right version of the external VEX repo, too
   svn up -r "$VEX_REV" VEX/
 
   # Apply common patches to Valgrind {{{1
   # Work around bug https://bugs.kde.org/show_bug.cgi?id=162848
   # "fork() not handled properly"
   patch -p0 -i "${THISDIR}/fork.patch"
 
@@ skipping 22 matching lines @@
   # $2 = flags to pass to configure
   # {{{1
   OUTPUT_DIR="$BINARIES_DIR/$1"
   CONFIGURE_FLAGS=$2
 
   PREV_DIR=`pwd`
 
   # Wipe out all Makefiles which could be left by the previous installation.
   make distclean || true
 
-  sh autogen.sh
+  sh autogen.sh || autoreconf -fvi
   if test -L install-sh
   then
     # replace symlink with actual contents!
     cp install-sh install-sh.new
     mv -f install-sh.new install-sh
     chmod +x install-sh
   fi
 
   # If gold is installed as a linker, use the old one
   OVERRIDE_LD_DIR="${THISDIR}/override_ld"
@@ skipping 113 matching lines @@
   case `uname -sm` in
     "Linux x86_64")
       # We can build both 64/32-bit and 32-bit Valgrinds
       build_valgrind "linux_x64"
       build_valgrind "linux_x86" "--enable-only32bit"
       ;;
     "Darwin i386")
       if uname -r | grep 9\.[0-9]\.[0-9] >/dev/null
       then
         build_valgrind "mac"
+      elif system_is_snow_leopard
+      then
+        build_valgrind "mac_10.6" "--build=amd64-darwin"
       else
-        echo "You have Darwin kernel different from 9.X.X" >&2
+        echo "You have Darwin kernel different from 9.X.X or 10.X.X" >&2
         echo "Please, don't put the resulting binaries into Chromium SVN" >&2
         build_valgrind "local"
       fi
       ;;
     *)
       build_valgrind "local"
       ;;
   esac
 }
 
 # Check that the binaries directory exists.
 BINARIES_DIR="$THISDIR/../binaries"
 if ! [ -a $BINARIES_DIR ]
 then
   echo "Error: $BINARIES_DIR doesn't exist!" >&2
   exit 1
 fi
 
 set -e
 set -x