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/bluetooth/libical.bst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'elements/bluetooth/libical.bst')

diff --git a/elements/bluetooth/libical.bst b/elements/bluetooth/libical.bst
index e5df04cb..8efd7d08 100644
--- a/elements/bluetooth/libical.bst
+++ b/elements/bluetooth/libical.bst
@@ -7,6 +7,5 @@ sources:
   url: upstream:libical-git
   track: v2.0.0
   ref: 6c4af23b0a95fd105f38e879908cbc80390f3716
-config:
-  configure-commands:
-  - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%{prefix}" -DCMAKE_INSTALL_LIBDIR=lib
+variables:
+  cmake-local: '-DCMAKE_BUILD_TYPE=Release '
-- 
cgit v1.2.1

