[tor-commits] [tor-messenger-build/master] Link libgcrypt and libgpg-error statically on OSX

[boklm at torproject.org]

commit 02063950f1c8c50f2a6f81079cb4ec120997be72
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Jun 30 17:28:16 2015 +0200

    Link libgcrypt and libgpg-error statically on OSX
---
 projects/ctypes-otr/build   |    2 +-
 projects/libgcrypt/build    |    2 +-
 projects/libgpg-error/build |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/ctypes-otr/build b/projects/ctypes-otr/build
index e7e5238..913a3e0 100644
--- a/projects/ctypes-otr/build
+++ b/projects/ctypes-otr/build
@@ -6,7 +6,7 @@ mv libotr/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/conten
 [% IF c('var/windows') -%]
 mv -f [% project %]-[% c('version') %]/chrome/content/libotr-*.dll \
       [% project %]-[% c('version') %]/chrome/content/otr.dll
-[% ELSE -%]
+[% ELSIF c('var/linux') -%]
 tar xf [% c('input_files_by_name/libgcrypt') %]
 mv libgcrypt/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/
 tar xf [% c('input_files_by_name/libgpg-error') %]
diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build
index e3e616e..640c99e 100644
--- a/projects/libgcrypt/build
+++ b/projects/libgcrypt/build
@@ -15,7 +15,7 @@ cd [% project %]-[% c('version') %]
 # our compiler does not like -g
 sed -i 's/ac_cv_prog_cc_g=yes/ac_cv_prog_cc_g=no/' configure
 [% END -%]
-./configure --prefix=$distdir [% c("var/configure_opt") %][% IF c('var/windows') %] --enable-static --disable-shared[% END %]
+./configure --prefix=$distdir [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %]
 make -j4
 make prefix=$distdir install
 cd /var/tmp/dist
diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build
index 1ee8f52..3d3749b 100644
--- a/projects/libgpg-error/build
+++ b/projects/libgpg-error/build
@@ -9,7 +9,7 @@ cd [% project %]-[% c('version') %]
 cp ../lock-obj-pub.x86_64-apple-darwin14.0.0.h src/syscfg/lock-obj-pub.darwin10.h
 echo 'int main() {}' > src/gen-posix-lock-obj.c
 [% END -%]
-./configure --prefix="$distdir" [% c("var/configure_opt") %][% IF c('var/windows') %] --enable-static --disable-shared[% END %]
+./configure --prefix="$distdir" [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %]
 make -j4
 make prefix="$distdir" install
 cd /var/tmp/dist