Merged: Comment out setting of TMP, do not recompute AUTOBUILD if it is already defined.

4 files changed, 22 insertions, 31 deletions

diff --git a/autobuild.xml b/autobuild.xml
index 9b6f50a6df..590c80f540 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>
@@ -1052,9 +1038,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>2b64ea42d54583ab82f4936ce6ea2a3c</string>
+              <string>873e8e99d29711df2efa30646dca1795</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20100930.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libuuid/rev/223995/arch/Linux/installer/uuid-1.6.2-linux-20110315.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -1316,11 +1302,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>fccdca18a950ac9363c6fb39118b80e1</string>
+              <string>30b9b33fb9320d9b6634e0dbb013b4e7</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-3ad86a1c-linux-20110114.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openal/rev/223977/arch/Linux/installer/openal-1.12.854-1.1.0-linux-20110315.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index f1584ff0c4..e2b7d3b888 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -257,9 +257,9 @@ elseif(LINUX)
         libopenal.so
         libopenjpeg.so
         libssl.so
-        libstacktrace.so
         libtcmalloc.so
-        libuuid.so.1
+        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)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index addaafa494..dad0519a8a 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -938,7 +938,9 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libcrypto.so.0.9.8")
             self.path("libexpat.so.1.5.2")
             self.path("libssl.so.0.9.8")
-            self.path("libuuid.so.1")
+            self.path("libuuid.so")
+            self.path("libuuid.so.16")
+            self.path("libuuid.so.16.0.22")
             self.path("libSDL-1.2.so.0.11.3")
             self.path("libdirectfb-1.4.so.5.0.4")
             self.path("libfusion-1.4.so.5.0.4")
@@ -947,7 +949,11 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libopenjpeg.so.1")
             self.path("libopenjpeg.so")
             self.path("libalut.so")
-            self.path("libopenal.so", "libopenal.so.1")
+            self.path("libalut.so.0")
+            self.path("libalut.so.0.0.0")
+            self.path("libopenal.so")
+            self.path("libopenal.so.1")
+            self.path("libopenal.so.1.12.854")
             self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname
             self.path("libfontconfig.so.1.4.4")
             try: