[tor-commits] [tor-messenger-build/master] Fix libgcrypt OSX build

[boklm at torproject.org]

commit 216aa70325200021b9e02033cbd2221c4f18ea99
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Jun 23 21:22:15 2015 +0200

    Fix libgcrypt OSX build
    
    Our compiler doesn't like the -g option, so we use a hack to change the
    configure script so the -g flag is not added.
---
 projects/libgcrypt/build  |    4 ++++
 projects/libgcrypt/config |    5 +++++
 2 files changed, 9 insertions(+)

diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build
index f6afc0f..e3e616e 100644
--- a/projects/libgcrypt/build
+++ b/projects/libgcrypt/build
@@ -11,6 +11,10 @@ distdir=/var/tmp/dist/[% project %]
 mkdir -p $distdir
 tar xf [% project %]-[% c('version') %].tar.bz2
 cd [% project %]-[% c('version') %]
+[% IF c("var/osx") -%]
+# 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 %]
 make -j4
 make prefix=$distdir install
diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config
index d079326..d98d4f7 100644
--- a/projects/libgcrypt/config
+++ b/projects/libgcrypt/config
@@ -23,6 +23,11 @@ targets:
     var:
       arch_deps:
         - libc6-dev-i386
+  osx-x86_64:
+    lsb_release:
+      id: Ubuntu
+      release: 12.04
+      codename: precise
 input_files:
   - URL: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.2.tar.bz2
     sig_ext: sig