[gtk-osx] Patch libgpg-error and libgcrypt Makefiles to pass to CC_FOR_BUILD.

[John Ralls <jralls src gnome org>]

commit 0aba26eac4aa7b1119dfad241a8ab206dc1c7d90
Author: John Ralls <jralls ceridwen us>
Date:   Fri Nov 13 17:54:57 2015 -0800

    Patch libgpg-error and libgcrypt Makefiles to pass  to CC_FOR_BUILD.

 modulesets-stable/gtk-osx-unsupported.modules      |   16 +++++--
 modulesets-unstable/gtk-osx-unsupported.modules    |    2 +-
 modulesets/gtk-osx-unsupported.modules             |    5 ++-
 patches/libgcrypt-cflags-for-cc-for-build.patch    |   13 ++++++
 patches/libgpg-error-cflags-for-cc-for-build.patch |   40 ++++++++++++++++++++
 ...=> webkit-1.6-remove-pangoft2-dependency.patch} |    0
 6 files changed, 69 insertions(+), 7 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 712473b..d55e05d 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -38,7 +38,7 @@
              autogenargs="--without-trust-paths">
     <branch repo="p11-glue" version="0.22.1"
            module="p11-kit-0.22.1.tar.gz">
-<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/p11-kit-dirfd.patch";
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/p11-kit-dirfd.patch";
        strip="1"/>
     </branch>
     <dependencies>
@@ -67,15 +67,21 @@
     </dependencies>
   </autotools>
 
-   <autotools id="libgpg-error" autogen-sh="configure"
+   <autotools id="libgpg-error" autogen-sh="autogen.sh"
              supports-non-srdir-builds="no">
     <branch repo="ftp.gnupg.org" version="1.17"
-            module="gcrypt/libgpg-error/libgpg-error-1.17.tar.bz2"/>
+            module="gcrypt/libgpg-error/libgpg-error-1.17.tar.bz2">
+            <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/libgpg-error-cflags-for-cc-for-build.patch";
+       strip="1"/>
+    </branch>
   </autotools>
 
-  <autotools id="libgcrypt" autogen-sh="configure" autogenargs="--disable-asm">
+  <autotools id="libgcrypt" autogen-sh="autogen.sh" autogenargs="--disable-asm">
     <branch repo="ftp.gnupg.org" version="1.6.3"
-            module="gcrypt/libgcrypt/libgcrypt-1.6.3.tar.bz2"/>
+            module="gcrypt/libgcrypt/libgcrypt-1.6.3.tar.bz2">
+            <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libgcrypt-cflags-for-build.patch";
+       strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index 00e760a..0aa84be 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -45,7 +45,7 @@
     <branch repo='git.gnupg.org' module="libgpg-error" />
   </autotools>
 
-  <autotools id="libgcrypt" autogen-sh="configure"
+  <autotools id="libgcrypt" autogen-sh="autogeen.sh"
              autogenargs="--disable-asm --disable-doc">
     <branch repo="git.gnupg.org" module="libgcrypt"/>
     <dependencies>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index fa59b2e..e0d4792 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -70,7 +70,10 @@
     <branch repo="git.gnupg.org" revision="LIBGCRYPT_1_6_BRANCH"
             module="libgcrypt"/> -->
     <branch repo="ftp.gnupg.org" version="1.6.3"
-            module="gcrypt/libgcrypt/libgcrypt-1.6.3.tar.bz2"/>
+            module="gcrypt/libgcrypt/libgcrypt-1.6.3.tar.bz2">
+            <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libgcrypt-cflags-for-build.patch";
+       strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>
diff --git a/patches/libgcrypt-cflags-for-cc-for-build.patch b/patches/libgcrypt-cflags-for-cc-for-build.patch
new file mode 100644
index 0000000..5931516
--- /dev/null
+++ b/patches/libgcrypt-cflags-for-cc-for-build.patch
@@ -0,0 +1,13 @@
+--- a/doc/Makefile.am  Mon Feb 23 02:55:58 2015
++++ b/doc/Makefile.am  Fri Nov 13 15:59:27 2015
+@@ -42,7 +42,7 @@
+ man_MANS = $(myman_pages)
+ 
+ yat2m: yat2m.c
+-      $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
++      $(CC_FOR_BUILD) $(CFLAGS) -o $@ $(srcdir)/yat2m.c
+ 
+ .fig.png:
+       fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
+
+Diff finished.  Fri Nov 13 16:00:03 2015
diff --git a/patches/libgpg-error-cflags-for-cc-for-build.patch 
b/patches/libgpg-error-cflags-for-cc-for-build.patch
new file mode 100644
index 0000000..0c82d2c
--- /dev/null
+++ b/patches/libgpg-error-cflags-for-cc-for-build.patch
@@ -0,0 +1,40 @@
+--- b/src/Makefile.am  Fri Nov  6 13:41:02 2015
++++ b/src/Makefile.am  Fri Nov  6 13:41:02 2015
+@@ -232,13 +232,13 @@
+ # It is correct to use $(CC_FOR_BUILD) here.  We want to run the
+ # program at build time.
+ mkerrcodes: mkerrcodes.c mkerrcodes.h Makefile
+-      $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c
++      $(CC_FOR_BUILD) -I. -I$(srcdir) $(CFLAGS) -o $@ $(srcdir)/mkerrcodes.c
+ 
+ if HAVE_W32CE_SYSTEM
+ # It is correct to use $(CC_FOR_BUILD) here.  We want to run the
+ # program at build time.
+ mkw32errmap: mkw32errmap.c mkw32errmap.tab.h Makefile
+-      $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c
++      $(CC_FOR_BUILD) -I. -I$(srcdir) $(CFLAGS) -o $@ $(srcdir)/mkw32errmap.c
+ endif
+ 
+ code-from-errno.h: mkerrcodes Makefile
+@@ -251,7 +251,7 @@
+ 
+ 
+ mkheader: mkheader.c Makefile
+-      $(CC_FOR_BUILD) -g -O0 -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
++      $(CC_FOR_BUILD) -g -O0 -I. -I$(srcdir) $(CFLAGS) -o $@ $(srcdir)/mkheader.c
+ 
+ parts_of_gpg_error_h =                \
+       gpg-error.h.in          \
+--- b/doc/Makefile.am  Fri Nov  6 13:41:02 2015
++++ b/doc/Makefile.am  Fri Nov  6 13:41:02 2015
+@@ -35,7 +35,7 @@
+ man_MANS = $(myman_pages)
+ 
+ yat2m: yat2m.c
+-      $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
++      $(CC_FOR_BUILD)  $(CFLAGS) -o $@ $(srcdir)/yat2m.c
+ 
+ 
+ yat2m-stamp: $(myman_sources)
+
+Diff finished.  Fri Nov  6 13:41:58 2015
diff --git a/patches/webkit-1.6.-remove-pangoft2-dependency.patch 
b/patches/webkit-1.6-remove-pangoft2-dependency.patch
similarity index 100%
rename from patches/webkit-1.6.-remove-pangoft2-dependency.patch
rename to patches/webkit-1.6-remove-pangoft2-dependency.patch