[gnome-apps-nightly] Fix Geary nightly build on arm & aarch64.
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-apps-nightly] Fix Geary nightly build on arm & aarch64.
- Date: Sat, 27 Aug 2016 03:19:39 +0000 (UTC)
commit d94280a35788c04d93be1faf83a3550dd1cfc884
Author: Michael James Gratton <mike vee net>
Date: Sat Aug 27 13:19:14 2016 +1000
Fix Geary nightly build on arm & aarch64.
org.gnome.Geary.json | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index c8ee91d..d8ccfbb 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -48,6 +48,16 @@
"modules": [
{
"name": "gnome-doc-utils",
+ "build-options": {
+ "arch" : {
+ /* Lie about our arch - no actual compilation happens here. */
+ "arm": {
+ "config-opts": [ "--build=amd64" ]
+ },
+ "aarch64": {
+ "config-opts": [ "--build=amd64" ]
+ }
+ } },
"sources": [
{
"type": "archive",
@@ -58,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",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]