From 0be43cf1c2ba785bcab62c1a64c2e53d30dc6f5d Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Thu, 9 Aug 2012 10:56:29 -0400
Subject: [PATCH] Fixed GCC47 issues and fmodex copying

---
 indra/llmath/lloctree.h          |  2 +-
 indra/llmessage/llcurl.cpp       |  7 ++++---
 indra/llmessage/llcurl.h         |  7 ++++---
 indra/newview/viewer_manifest.py | 10 ++++++++++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 07ca00913..cc1482b18 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -457,7 +457,7 @@ public:
 			mDataEnd = NULL;
 		}
 
-		notifyRemoval(data);
+		this->notifyRemoval(data);
 		checkAlive();
 	}
 
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index fc057d969..f7fde67be 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -199,8 +199,9 @@ void LLCurl::Responder::completedHeader(U32 status, const std::string& reason, c
 
 }
 
-namespace boost
-{
+// DONT UNCOMMENT THIS IT BREAKS GCC47
+//namespace boost
+//{
 	void intrusive_ptr_add_ref(LLCurl::Responder* p)
 	{
 		++p->mReferenceCount;
@@ -213,7 +214,7 @@ namespace boost
 			delete p;
 		}
 	}
-};
+//};
 
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index 76ef595e9..67abb30ff 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -304,11 +304,12 @@ private:
 	easy_free_list_t mEasyFreeList;
 };
 
-namespace boost
-{
+// DONT UNCOMMENT BREAKS GCC47
+//namespace boost
+//{
 	void intrusive_ptr_add_ref(LLCurl::Responder* p);
 	void intrusive_ptr_release(LLCurl::Responder* p);
-};
+//};
 
 
 class LLCurlRequest
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 4775a72e9..513b13589 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -854,6 +854,16 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("libopenal.so*")
             self.path("libalut.so*")
 
+            if self.args['extra_libraries'] != None:
+                print self.args['extra_libraries']
+                path_list = self.args['extra_libraries'].split('|')
+                for path in path_list:
+                    path = os.path.realpath(path)
+                    path_pair = path.rsplit('/', 1)
+                    if self.prefix(src=path_pair[0], dst="lib64"):
+                        self.path(path_pair[1])
+                        self.end_prefix()
+
             self.end_prefix("lib64")
 
             # Vivox runtimes and libs