summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-04-19 21:43:13 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-04-19 21:43:13 -0400
commitc7721b86c6df55cbfcdb51970944b79ed8674f4e (patch)
tree4c0d0895ab3d8ef895b4f3a1f92abf8cd7e80525 /indra/cmake
parent2866e1d9e1a39a07c872486332e3301eddf17acb (diff)
New openssl package solves permissions problems with Linux build.
The original Linux openssl tarball includes libcrypto.so and libssl.so files with r-xr-xr-x permissions: not even the owning user can modify them. This causes problems when the Release build tries to 'strip' the viewer and all associated libraries. Newer openssl tarball fixes permission problems. The newer openssl package also updates from 0.9.8 to 1.0.0, so have to fix version numbers in Copy3rdPartyLibs.cmake and viewer_manifest.py too. :-P Presumably the only reason this hasn't been causing trouble with TC builds is that the link has been picking up system libraries instead of the ones from the openssl package.
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 4698116022..1c43c4ce12 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -243,7 +243,7 @@ elseif(LINUX)
libaprutil-1.so.0
libatk-1.0.so
libbreakpad_client.so.0
- libcrypto.so.0.9.8
+ libcrypto.so.1.0.0
libdb-5.1.so
libexpat.so
libexpat.so.1
@@ -259,7 +259,7 @@ elseif(LINUX)
libtcmalloc.so
libuuid.so.16
libuuid.so.16.0.22
- libssl.so.0.9.8
+ libssl.so.1.0.0
libfontconfig.so.1.4.4
)