diff options
| author | Andrew de Laix <alain@lindenlab.com> | 2011-03-15 20:54:22 +0000 |
|---|---|---|
| committer | Andrew de Laix <alain@lindenlab.com> | 2011-03-15 20:54:22 +0000 |
| commit | cd8485f9c0535455142f7f979159dcf8027ae93c (patch) | |
| tree | 5abd49e0862803f0be73e8e69e16fb65d1c32fd4 | |
| parent | 650dd40187d63eb892a313b12d431f6b485e2dde (diff) | |
update uuid archive for linux.
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/autobuild.xml b/autobuild.xml index 8e6ad226f3..11ffd12123 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1052,9 +1052,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> diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index f1584ff0c4..169502731d 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -259,7 +259,7 @@ elseif(LINUX) libssl.so libstacktrace.so libtcmalloc.so - libuuid.so.1 + libuuid.so.16.0.22 libssl.so.0.9.8 libfontconfig.so.1.4.4 ) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2b756c8dce..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") |