| Index: scripts/common.sh
|
| ===================================================================
|
| --- scripts/common.sh (revision 50101)
|
| +++ scripts/common.sh (working copy)
|
| @@ -10,6 +10,10 @@
|
| 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
|
| @@ -21,11 +25,18 @@
|
| 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
|
| @@ -68,7 +79,7 @@
|
| # 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!
|
| @@ -202,8 +213,11 @@
|
| 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
|
|
|