From 2f7fa7ba205f6f473f816dd2e1b42d49090ddd50 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 9 Sep 2010 13:36:02 +0100
Subject: [PATCH] Backed out changeset 1c8d9c22bf94
---
indra/cmake/APR.cmake | 2 +-
indra/cmake/Copy3rdPartyLibs.cmake | 1 +
indra/cmake/ViewerMiscLibs.cmake | 1 +
indra/newview/viewer_manifest.py | 1 +
install.xml | 19 +++++++++++++++++++
5 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index b6f1e06edd0..180504d2862 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -56,7 +56,7 @@ else (STANDALONE)
if (LINUX)
if (VIEWER)
- list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES})
+ list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid)
endif (VIEWER)
list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt)
endif (LINUX)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index a7567708817..2dd296bf121 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -232,6 +232,7 @@ elseif(LINUX)
libssl.so
libstacktrace.so
libtcmalloc.so
+ libuuid.so.1
libssl.so.0.9.7
)
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 5710360de21..32c4bc81dfc 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -2,6 +2,7 @@
include(Prebuilt)
if (NOT STANDALONE)
+ use_prebuilt_binary(libuuid)
use_prebuilt_binary(vivox)
use_prebuilt_binary(fontconfig)
endif(NOT STANDALONE)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c447a977f0e..08ba8c13b1f 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -922,6 +922,7 @@ def construct(self):
self.path("libcrypto.so.0.9.7")
self.path("libexpat.so.1")
self.path("libssl.so.0.9.7")
+ self.path("libuuid.so.1")
self.path("libSDL-1.2.so.0")
self.path("libELFIO.so")
self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
diff --git a/install.xml b/install.xml
index 3d90c4eed23..a47a732d56a 100644
--- a/install.xml
+++ b/install.xml
@@ -891,6 +891,25 @@ anguage Infrstructure (CLI) international standard</string>
</map>
</map>
</map>
+ <key>libuuid</key>
+ <map>
+ <key>copyright</key>
+ <string>Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/></string>
+ <key>description</key>
+ <string>Generates UUIDs under Linux. Originally a part of the ext2fs filesystem. Also see lluuid.cpp for all platforms. Part of the e2fsprogs package.</string>
+ <key>license</key>
+ <string>lgpl</string>
+ <key>packages</key>
+ <map>
+ <key>linux</key>
+ <map>
+ <key>md5sum</key>
+ <string>91b194aed4b38bc23493b198009a8c6a</string>
+ <key>url</key>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20090417.tar.bz2</uri>
+ </map>
+ </map>
+ </map>
<key>libxml</key>
<map>
<key>license</key>
--
GitLab