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/WebKitGtk.bst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'elements/gnome/gnome/WebKitGtk.bst')

diff --git a/elements/gnome/gnome/WebKitGtk.bst b/elements/gnome/gnome/WebKitGtk.bst
index d4a793a9..e332965f 100644
--- a/elements/gnome/gnome/WebKitGtk.bst
+++ b/elements/gnome/gnome/WebKitGtk.bst
@@ -27,7 +27,7 @@ sources:
   url: upstream:WebKitGtk-tarball
   track: webkitgtk-2.16.5
   ref: 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c
-config:
-  configure-commands:
-  - CXXFLAGS=-Wno-expansion-to-defined cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release
-    -DCMAKE_INSTALL_PREFIX="%{prefix}" -DCMAKE_INSTALL_LIBDIR=lib
+variables:
+  cmake-local: "-DPORT=GTK -DCMAKE_BUILD_TYPE=Release"
+environment:
+  CXXFLAGS: "-Wno-expansion-to-defined"
-- 
cgit v1.2.1

