[gnome-continuous] Attempt at fixing libical's introspection

[Emmanuele Bassi <ebassi src gnome org>]

commit f5bb988977e64f185fcd86c406ff7eef727d9295
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Oct 13 11:56:57 2016 +0100

    Attempt at fixing libical's introspection
    
    We start by passing CC to the introspection scanner, to avoid it picking
    up the wrong compiler from the environment. Hopefully it's enough to
    avoid the build failure caused by launching g-ir-scanner picking up the
    compiler used to build distutils:
    
    distutils.errors.DistutilsExecError: command
    'x86_64-gnomeostree-linux-gcc' failed with exit status 1

 manifest.json                             |    3 +-
 patches/libical-build-introspection.patch |   33 +++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index d9c9416..137c694 100644
--- a/manifest.json
+++ b/manifest.json
@@ -941,7 +941,8 @@
                {"src": "gnome:gnome-online-miners"},
 
                {"src": "libical:libical",
-                "patches": ["libical-cmake-buildapi.patch"]},
+                "patches": ["libical-cmake-buildapi.patch",
+                             "libical-build-introspection.patch"]},
 
                {"src": "gnome:evolution-data-server",
                 "tag": "57ad04c29303723dd8fa4082aeb6380c0873265f",
diff --git a/patches/libical-build-introspection.patch b/patches/libical-build-introspection.patch
new file mode 100644
index 0000000..8873c12
--- /dev/null
+++ b/patches/libical-build-introspection.patch
@@ -0,0 +1,33 @@
+From 17e051cf3ea2421bb094d00d85d71761349e9833 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Thu, 13 Oct 2016 11:53:58 +0100
+Subject: [PATCH] build: Pass 'CC' to the introspection scanner
+
+This avoids g-ir-scanner picking up a different compiler from the
+environment than the one specified when building.
+
+The behaviour is the same as the one provided by GObject introspection
+itself in its autotools integration, except it's missing CFLAGS,
+CPPFLAGS, and LDFLAGS, because their presence makes the command line too
+long.
+---
+ cmake/modules/GObjectIntrospectionMacros.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/GObjectIntrospectionMacros.cmake b/cmake/modules/GObjectIntrospectionMacros.cmake
+index 98a38e4..33e2c0f 100644
+--- a/cmake/modules/GObjectIntrospectionMacros.cmake
++++ b/cmake/modules/GObjectIntrospectionMacros.cmake
+@@ -50,7 +50,8 @@ macro(gir_add_introspections introspections_girs)
+     set(_gir_libtool "--no-libtool")
+ 
+     add_custom_command(
+-      COMMAND ${INTROSPECTION_SCANNER}
++      COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'"
++              ${INTROSPECTION_SCANNER}
+               ${INTROSPECTION_SCANNER_ARGS}
+               --namespace=${_gir_namespace}
+               --nsversion=${_gir_version}
+-- 
+2.9.3
+