[tor-commits] [tor-messenger-build/master] Link libotr.dll statically

[boklm at torproject.org]

commit b4189c979bd605aa63db6a309bdb585cf71ce1b8
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Wed Jun 10 23:43:36 2015 +0200

    Link libotr.dll statically
---
 projects/libgcrypt/build    |    2 +-
 projects/libgpg-error/build |    2 +-
 projects/libotr/config      |    3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build
index d6c0da5..f47bc62 100644
--- a/projects/libgcrypt/build
+++ b/projects/libgcrypt/build
@@ -11,7 +11,7 @@ distdir=/tmp/dist/[% project %]
 mkdir -p $distdir
 tar xf [% project %]-[% c('version') %].tar.bz2
 cd [% project %]-[% c('version') %]
-./configure --prefix=$distdir [% c("var/configure_opt") %]
+./configure --prefix=$distdir [% c("var/configure_opt") %][% IF c('var/windows') %] --enable-static --disable-shared[% END %]
 make -j4
 make prefix=$distdir install
 cd /tmp/dist
diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build
index 5ec67c7..baf59de 100644
--- a/projects/libgpg-error/build
+++ b/projects/libgpg-error/build
@@ -5,7 +5,7 @@ mkdir -p "$distdir"
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 tar xf [% project %]-[% c('version') %].tar.bz2
 cd [% project %]-[% c('version') %]
-./configure --prefix="$distdir" [% c("var/configure_opt") %]
+./configure --prefix="$distdir" [% c("var/configure_opt") %][% IF c('var/windows') %] --enable-static --disable-shared[% END %]
 make -j4
 make prefix="$distdir" install
 cd /tmp/dist
diff --git a/projects/libotr/config b/projects/libotr/config
index ed174e0..bad9713 100644
--- a/projects/libotr/config
+++ b/projects/libotr/config
@@ -20,6 +20,9 @@ targets:
     var:
       arch_deps:
         - gettext
+      configure_opt: '--host=i686-w64-mingw32 CFLAGS="[% c("var/CFLAGS_otr") %]" LDFLAGS="[% c("var/LDFLAGS_otr") %]" CC="i686-w64-mingw32-gcc -static-libgcc"'
+      CFLAGS_otr: '[% c("var/CFLAGS") %] -Wl,-Bstatic,-L/tmp/dist/libgcrypt/lib,-lgcrypt,-L/tmp/dist/libgpg-error/lib,-lgpg-error,-Bdynamic'
+      LDFLAGS_otr: '[% c("var/LDFLAGS") %] -Wl,-Bstatic,-L/tmp/dist/libgcrypt/lib,-lgcrypt,-L/tmp/dist/libgpg-error/lib,-lgpg-error,-Bdynamic'
   linux-i686:
     var:
       arch_deps: