From da19a12f7aa632556b302f93f2c0cb956c014e08 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Mon, 19 Feb 2018 15:51:27 +0000
Subject: Update to build with BuildStream 1.0.1

We were previously building with an old 0.x version.

This requires a fix to how we import the 'x86image' plugin from the
bst-external plugins repo.

It also requires a couple of fixes to elements which need to add things
to the CMake configure commandline. These should use the new
'cmake-local' variable rather than overriding the configure-commands
as a whole; the builds of these elements were breaking because the
default commands changed upstream to expect out-of-tree builds.
---
 elements/gnome/gnome/evolution-data-server.bst | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'elements/gnome/gnome/evolution-data-server.bst')

diff --git a/elements/gnome/gnome/evolution-data-server.bst b/elements/gnome/gnome/evolution-data-server.bst
index b3965890..94bb45ee 100644
--- a/elements/gnome/gnome/evolution-data-server.bst
+++ b/elements/gnome/gnome/evolution-data-server.bst
@@ -30,8 +30,14 @@ sources:
   url: upstream:evolution-data-server
   track: gnome-3-24
   ref: 6ad2fc6fba46d79449be4090eafd91015d0d8cce
+
+# Note that this version of e-d-s fails to build when builddir != srcdir.
 config:
   configure-commands:
   - cmake -DCMAKE_INSTALL_PREFIX="%{prefix}" -DSYSCONFDIR=/etc -DENABLE_INTROSPECTION=ON
     -DENABLE_UOA=OFF -DENABLE_VALA_BINDINGS=ON -DWITH_LIBDB=OFF -DWITH_OPENLDAP=OFF
     .
+  build-commands:
+  - make
+  install-commands:
+  - make -j1 DESTDIR="%{install-root}" install
-- 
cgit v1.2.1

