From 38bdbbd01921e008a5882739992fd8139ec9e1fb Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Wed, 16 Mar 2011 16:06:47 +0000
Subject: rename google archive for linux to google-perftools and update to
 latest.

---
 autobuild.xml                      | 28 +++++++---------------------
 indra/cmake/Copy3rdPartyLibs.cmake |  2 +-
 indra/cmake/GooglePerfTools.cmake  |  3 +--
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 11ffd12123..6bf06212a9 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -639,12 +639,14 @@
           </map>
         </map>
       </map>
-      <key>google</key>
+      <key>google-perftools</key>
       <map>
         <key>license</key>
-        <string>mit</string>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/google-perftools.txt</string>
         <key>name</key>
-        <string>google</string>
+        <string>google-perftools</string>
         <key>platforms</key>
         <map>
           <key>linux</key>
@@ -652,29 +654,13 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7d9d1b6d32ee273df164f7b7d5f29848</string>
-              <key>hash_algorithm</key>
-              <string>md5</string>
+              <string>cf513fc2eec4a414cc804cf408932a45</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-0.0.0-linux-20110114.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-google-perftools/rev/224046/arch/Linux/installer/google_perftools-1.7-linux-20110315.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
           </map>
-        </map>
-        <key>version</key>
-        <string>0.0.0</string>
-      </map>
-      <key>google-perftools</key>
-      <map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/google.txt</string>
-        <key>name</key>
-        <string>google-perftools</string>
-        <key>platforms</key>
-        <map>
           <key>windows</key>
           <map>
             <key>archive</key>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 169502731d..e2b7d3b888 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -257,8 +257,8 @@ elseif(LINUX)
         libopenal.so
         libopenjpeg.so
         libssl.so
-        libstacktrace.so
         libtcmalloc.so
+        libuuid.so.16
         libuuid.so.16.0.22
         libssl.so.0.9.8
         libfontconfig.so.1.4.4
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 133ae14d2f..6c784a3a76 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -12,9 +12,8 @@ else (STANDALONE)
     set(GOOGLE_PERFTOOLS_FOUND "YES")
   endif (WINDOWS)
   if (LINUX)
-    use_prebuilt_binary(google)
+    use_prebuilt_binary(google-perftools)
     set(TCMALLOC_LIBRARIES tcmalloc)
-    set(STACKTRACE_LIBRARIES stacktrace)
     set(PROFILER_LIBRARIES profiler)
     set(GOOGLE_PERFTOOLS_INCLUDE_DIR
         ${LIBS_PREBUILT_DIR}/include)
-- 
cgit v1.2.3