diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-23 14:59:03 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-23 14:59:03 -0400 |
| commit | 7f9285979d744ee3591f810928e2ab570baba90e (patch) | |
| tree | 2e5a63748f124eff3d3139cf8db327da8db69bc7 | |
| parent | bc488500962f75ac6d5dcdac4db4f2d7f293bf89 (diff) | |
WIP make tcmalloc work on linux (JIRA pending)
First pass at integrating the linux version of tcmalloc.
Code will be reviewed in a later commit before pushing.
| -rwxr-xr-x | indra/cmake/Copy3rdPartyLibs.cmake | 2 | ||||
| -rwxr-xr-x | indra/cmake/GooglePerfTools.cmake | 5 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 1 | ||||
| -rwxr-xr-x | install.xml | 7 |
4 files changed, 13 insertions, 2 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9900a8fb45..915f9c183f 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -235,7 +235,7 @@ elseif(LINUX) libopenjpeg.so libssl.so libstacktrace.so - libtcmalloc.so + libtcmalloc_minimal.so libuuid.so.1 libssl.so.0.9.7 ) diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index dc6d013bf2..5581b3b0e3 100755 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -13,7 +13,10 @@ else (STANDALONE) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) if (LINUX) - set(TCMALLOC_LIBRARIES tcmalloc) + use_prebuilt_binary(tcmalloc) + set(TCMALLOC_LIBRARIES + debug libtcmalloc_minimal_debug + optimized libtcmalloc_minimal) set(STACKTRACE_LIBRARIES stacktrace) set(PROFILER_LIBRARIES profiler) set(GOOGLE_PERFTOOLS_INCLUDE_DIR diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 8296c28e80..9269c4a85b 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -937,6 +937,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libalut.so") self.path("libopenal.so", "libopenal.so.1") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname + self.path("libtcmalloc_minimal.so", "libtcmalloc_minimal.so") #formerly called google perf tools try: self.path("libkdu.so") pass diff --git a/install.xml b/install.xml index f2f4a1b92c..518d4274b5 100755 --- a/install.xml +++ b/install.xml @@ -640,6 +640,13 @@ <string>bsd</string> <key>packages</key> <map> + <key>linux</key> + <map> + <key>md5sum</key> + <string>05e42157c7324115f0266b61baf5fa07</string> + <key>url</key> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/tcmalloc-1.6-linux-20100921.tar.bz2</uri> + </map> <key>windows</key> <map> <key>md5sum</key> |