From e089937a0de6a82a6f39bb840c7dd99cfdde9869 Mon Sep 17 00:00:00 2001
From: Techwolf Lupindo <bitbucket.org@trap.wereanimal.net>
Date: Sun, 22 Aug 2010 16:05:41 -0400
Subject: [PATCH] VWR-20893: "class Linux_x86_64Manifest" missing from
viewer_manifest.py Breaking linux 64-bit build. (transplanted from
111a293c0e1c9062b1aa83dda7cf28aa22754930)
---
doc/contributions.txt | 1 +
indra/newview/viewer_manifest.py | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2e4d8032525..7b47cd25ae5 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -594,6 +594,7 @@ Teardrops Fall
Techwolf Lupindo
SNOW-92
VWR-12385
+ VWR-20893
tenebrous pau
VWR-247
Tharax Ferraris
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 3f379fcf75b..cb9dd32cbe6 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -917,6 +917,13 @@ def construct(self):
print "* Going strip-crazy on the packaged binaries, since this is a RELEASE build"
self.run_command("find %(d)r/bin %(d)r/lib -type f | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure
+class Linux_x86_64Manifest(LinuxManifest):
+ def construct(self):
+ super(Linux_x86_64Manifest, self).construct()
+
+ # support file for valgrind debug tool
+ self.path("secondlife-i686.supp")
+
################################################################
if __name__ == "__main__":
--
GitLab