From 3b6606eed8b04783f8b80df71e4fe24f7432bde5 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Thu, 19 Jan 2012 12:04:42 -0500
Subject: PATH-180 FIX? updating to latest pathing lib, and ensuring order
invariance
Grabbing latest packaged pathing library, and adding linker flags to
deal with circular dependencies.`
---
autobuild.xml | 4 ++--
indra/cmake/LLPathingLib.cmake | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 339c3286ae..2175626251 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1254,9 +1254,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>760a7e956f6ed540d3b655dafc57788a</string>
+ <string>76cac9c6be702db7402623a405f7e59c</string>
<key>url</key>
- <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/247477/arch/Linux/installer/llpathinglibrary-0.1-linux-20120111.tar.bz2</string>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/248048/arch/Linux/installer/llpathinglibrary-0.1-linux-20120119.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake
index c108b33e8c..8e622d83db 100644
--- a/indra/cmake/LLPathingLib.cmake
+++ b/indra/cmake/LLPathingLib.cmake
@@ -16,3 +16,8 @@ set(LLPATHING_LIBRARIES
debug ${LL_PATHING_DEBUG_LIB}
optimized ${LL_PATHING_RELEASE_LIB}
)
+
+if (LINUX)
+ list(INSERT LLPATHING_LIBRARIES 0 -Wl,--start-group)
+ list(APPEND LLPATHING_LIBRARIES -Wl,--end-group)
+endif (LINUX)
--
cgit v1.2.3