[gtk-osx: 6/7] Add arch flags to CPPFLAGS

[John Ralls <jralls src gnome org>]

commit 48dc30e3d928e0f6c35f42cdcde7c6a5d499640b
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jan 29 15:33:59 2015 -0800

    Add arch flags to CPPFLAGS
    
    Because webkit1gtk3 tries to build some files with CPPFLAGS instead of CXXFLAGS.

 jhbuildrc-gtk-osx                             |    1 +
 modulesets-stable/gtk-osx-unsupported.modules |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 953d266..fb8af5c 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -324,6 +324,7 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
     for arch in architectures:
         environ_prepend("CFLAGS", "-arch " + arch)
         environ_prepend("CXXFLAGS", "-arch " + arch)
+        environ_prepend("CPPFLAGS", "-arch " + arch)
         environ_prepend("OBJCFLAGS", "-arch " + arch)
         environ_prepend("LDFLAGS", "-arch " + arch)
     # For intel, set glib's build parameter so that it builds the
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 3baa4d6..0320bed 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -227,13 +227,13 @@
   <autotools id="webkit1gtk3" autogen-sh="autoreconf" makeargs="-j1"
              autogenargs="--enable-quartz-target --with-gtk=3.0 --disable-webkit2 
--disable-credential-storage --disable-geolocation --disable-video --disable-web-audio 
CXXFLAGS='-std=gnu++11'">
     <branch repo="webkit.org" module="webkitgtk-2.4.8.tar.xz" version="2.4.8">
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-126324-clang-check.patch";
+      <patch 
file="file:///Users/john/Development/GTK-OSX/gtk-osx-build/patches/webkit-126324-clang-check.patch"
              strip="1"/>
-      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch";
+      <patch 
file="file:///Users/john/Development/GTK-OSX/gtk-osx-build/patches/webkit-140167-disable-netscape-api.patch"
              strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-133293-cfi-clang-failure.patch";
+      <patch 
file="file:///Users/john/Development/GTK-OSX/gtk-osx-build/patches/webkit-133293-cfi-clang-failure.patch"
              strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-126433-check-platform-gtk.patch";
+      <patch 
file="file:///Users/john/Development/GTK-OSX/gtk-osx-build/patches/webkit-126433-check-platform-gtk.patch"
              strip="1"/>
     </branch>
     <dependencies>