From bb51a764ece0f48161ddea1c519a7e427ccfdf23 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Wed, 8 Sep 2010 11:30:50 -0400
Subject: [PATCH] SNOW-606 FIX disable packaging of libuuid
Patch taken from JIRA, committing locally to fix our project branch.
Code reviewed by Nyx / Brad
(transplanted from 06c4d6b5d67f6624d76b5a7f61021ef2d53f44b4)
---
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, 1 insertion(+), 23 deletions(-)
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 180504d2862..b6f1e06edd0 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} uuid)
+ list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES})
endif (VIEWER)
list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt)
endif (LINUX)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 2dd296bf121..a7567708817 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -232,7 +232,6 @@ 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 32c4bc81dfc..5710360de21 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -2,7 +2,6 @@
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 08ba8c13b1f..c447a977f0e 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -922,7 +922,6 @@ 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 a47a732d56a..3d90c4eed23 100644
--- a/install.xml
+++ b/install.xml
@@ -891,25 +891,6 @@ 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