[tor-commits] [tor-messenger-build/master] Include libstdc++.so.6 in tor-messenger tarball

[boklm at torproject.org]

commit 88ebae38acb8f2fadacd6fd7a87f18be9aa8016d
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Oct 23 17:45:04 2014 +0200

    Include libstdc++.so.6 in tor-messenger tarball
    
    We need to include libstdc++.so.6 from the compiler we used to compile
    instantbird.
    
    We will probably need a script similar to start-tor-browser to set
    LD_LIBRARY_PATH before starting instandbird.
---
 projects/tor-messenger/build  |    3 +++
 projects/tor-messenger/config |    2 ++
 2 files changed, 5 insertions(+)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index a9cd18c..c4609c0 100644
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -1,6 +1,9 @@
 #!/bin/sh
 set -e
 tar xf [% c('input_files_by_name/instantbird') %]
+tar xf [% c('input_files_by_name/gcc') %]
+mkdir -p instantbird/lib
+cp -L gcc/lib64/libstdc++.so.6 instantbird/lib/
 cd instantbird/extensions
 tar xf ../../[% c('input_files_by_name/ctypes-otr') %]
 mv ctypes-otr* 'ctypes-otr at tormessenger'
diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config
index fa07d94..bdbb049 100644
--- a/projects/tor-messenger/config
+++ b/projects/tor-messenger/config
@@ -13,3 +13,5 @@ input_files:
   - project: tor-browser
     name: tor-browser
     pkg_type: build
+  - project: gcc
+    name: gcc