summaryrefslogtreecommitdiff
path: root/elements/bluetooth
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2018-02-19 15:51:27 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2018-02-23 13:47:51 (GMT)
commitda19a12f7aa632556b302f93f2c0cb956c014e08 (patch)
tree9154e6daabcf44b74ca2ada6246d4d0f4594b0fe /elements/bluetooth
parenta8363d777d9c7bc9413f3765152dc6382e767b52 (diff)
downloaddefinitions-da19a12f7aa632556b302f93f2c0cb956c014e08.tar.gz
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.
Diffstat (limited to 'elements/bluetooth')
-rw-r--r--elements/bluetooth/libical.bst5
1 files changed, 2 insertions, 3 deletions
diff --git a/elements/bluetooth/libical.bst b/elements/bluetooth/libical.bst
index e5df04c..8efd7d0 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 '