[gnome-apps-nightly/gnome-3-20] Fix Geary gnome-doc-utils build for arm and webkitgtk on aarch64.

[Michael Gratton <mjog src gnome org>]

commit 5a0cb7ffa4c1f981771c4cfa3d4b9562b2ffbaea
Author: Michael James Gratton <mike vee net>
Date:   Mon Jul 11 10:44:55 2016 +1000

    Fix Geary gnome-doc-utils build for arm and webkitgtk on aarch64.

 org.gnome.Geary.json |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index f08f1f4..b59f312 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -50,10 +50,11 @@
             "build-options": {
                 "arch" : {
                            /* Lie about our arch - no actual compilation happens here. */
+                    "arm": {
+                        "config-opts": [ "--build=amd64" ]
+                    }
                     "aarch64": {
-                        "config-opts": [
-                            "--build=amd64"
-                        ]
+                        "config-opts": [ "--build=amd64" ]
                     }
                 }
             },
@@ -67,7 +68,26 @@
         },
         {
             "name": "webkitgtk",
-            "config-opts": [ "--with-gtk=3.0", "--enable-jit", "--disable-webkit2", "--enable-introspection" 
],
+            "config-opts": [
+                "--with-gtk=3.0",
+                "--enable-jit",
+                "--disable-webkit2",
+                "--enable-introspection"
+            ],
+            "build-options" : {
+                "arch" : {
+                    "x86_64" : { "config-opts" : [ "--enable-jit" ] }
+                    "i386" : { "config-opts" : [ "--enable-jit" ] }
+                           /* Following tricks to build on aarch64 from bijiben.json */
+                    "aarch64" : {
+                                   "cflags": "-DENABLE_YARR_JIT=0 -fno-delete-null-pointer-checks",
+                                   "cxxflags": "-DENABLE_YARR_JIT=0 -fno-delete-null-pointer-checks",
+                        "config-opts" : [
+                            "--disable-jit"
+                        ]
+                    }
+                }
+            },
             "sources": [
                 {
                     "type": "archive",