From da19a12f7aa632556b302f93f2c0cb956c014e08 Mon Sep 17 00:00:00 2001 From: Sam Thursfield 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/navigation/navit.bst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'elements/navigation/navit.bst') diff --git a/elements/navigation/navit.bst b/elements/navigation/navit.bst index c3174039..70ae3369 100644 --- a/elements/navigation/navit.bst +++ b/elements/navigation/navit.bst @@ -6,6 +6,5 @@ sources: url: upstream:navit-svn track: master ref: 358812af2c27c4abe324beb205e6d156b96fb1ea -config: - configure-commands: - - cmake . -DSAMPLE_MAP=n +variables: + cmake-local: '-DSAMPLE_MAP=n' -- cgit v1.2.1