[gtk-osx: 7/7] Merge branch 'update-gnutls' of https://github.com/ptomato/gtk-osx-build

[John Ralls <jralls src gnome org>]

commit 58e18e9495fdad6317444caf7125fd76df53a143
Merge: f60fc5d 9413144
Author: John Ralls <jralls ceridwen us>
Date:   Tue Jan 27 16:34:10 2015 -0800

    Merge branch 'update-gnutls' of https://github.com/ptomato/gtk-osx-build
    
    Add host param for gnutls so that it will assemble the correct architecture
    files for -arch i386 when building on an x86_64.

 jhbuildrc-gtk-osx                               |    2 +
 modulesets-stable/gtk-osx-unsupported.modules   |   49 +++++++++++++-----
 modulesets-unstable/gtk-osx-unsupported.modules |   39 ++++++--------
 modulesets/gtk-osx-unsupported.modules          |   61 ++++++++++++++++-------
 4 files changed, 97 insertions(+), 54 deletions(-)
---
diff --cc jhbuildrc-gtk-osx
index 87b88b5,87b88b5..953d266
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@@ -333,10 -333,10 +333,12 @@@ def setup_sdk(target, sdk_version, arch
          append_autogenargs("glib", "--build=i486-apple-darwin")
          append_autogenargs("gmp", "ABI=32")
          append_autogenargs("liboil", "--host=i486-apple-darwin")
++        append_autogenargs("gnutls", "--host=i486-apple-darwin")
      elif architectures == ["x86_64"]:
          append_autogenargs("glib", "--build=x86_64-apple-darwin")
          append_autogenargs("gmp", "--host=x86_64-apple-darwin ABI=64")
          append_autogenargs("liboil", "--host=x86_64-apple-darwin")
++        append_autogenargs("gnutls", "--host=x86_64-apple-darwin")
  
      # Tiger has a somewhat messed-up resolv.h, so we need to explicitly
      # link libresolv: