[tor-commits] [tor-messenger-build/master] Only include libstdc++.so.6 and start script on Linux

[boklm at torproject.org]

commit d9a55e86fcbb3ad6bb42213ffbfcdf053e5e9545
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Nov 27 22:36:50 2014 +0100

    Only include libstdc++.so.6 and start script on Linux
---
 projects/tor-messenger/build  |    4 ++++
 projects/tor-messenger/config |    1 +
 2 files changed, 5 insertions(+)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index 4c86230..5690fac 100644
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -1,11 +1,15 @@
 #!/bin/sh
 set -e
 tar xf [% c('input_files_by_name/instantbird') %]
+
+[% IF c("var/linux") %]
 tar xf [% c('input_files_by_name/gcc') %]
 chmod 755 start-tor-messenger
 mv start-tor-messenger instantbird/
 mkdir -p instantbird/lib
 cp -L gcc/lib64/libstdc++.so.6 instantbird/lib/
+[% END %]
+
 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 050b4aa..fee87e2 100644
--- a/projects/tor-messenger/config
+++ b/projects/tor-messenger/config
@@ -15,4 +15,5 @@ input_files:
     pkg_type: build
   - project: gcc
     name: gcc
+    enable: '[% c("var/linux") %]'
   - filename: start-tor-messenger