From 54e447a9f1a9e94d68e6f5f616617ce49682192a Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 23 Aug 2017 15:45:29 +0000 Subject: genivi: Fix build issues in Audiomanager If USE_BUILD_LIBS is enabled, the build fails under BuildStream. This seems to be because files get installed to $DESTDIR/buildstream/build which are then included in the artifacts. (This breaks subsequent builds as the /buildstream/build/ dir is expected to be empty until source is checked out.) https://gitlab.com/BuildStream/buildstream/issues/74 is the relevant BuildStream issue. --- genivi/strata/genivi-demo-platform/audiomanager@gdp.morph | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'genivi') diff --git a/genivi/strata/genivi-demo-platform/audiomanager@gdp.morph b/genivi/strata/genivi-demo-platform/audiomanager@gdp.morph index 1522f3e6..d5e4684a 100644 --- a/genivi/strata/genivi-demo-platform/audiomanager@gdp.morph +++ b/genivi/strata/genivi-demo-platform/audiomanager@gdp.morph @@ -2,7 +2,8 @@ name: audiomanager@gdp kind: chunk configure-commands: - | - cmake -DWITH_PULSE_ROUTING_PLUGIN=ON \ + cmake -DUSE_BUILD_LIBS=OFF \ + -DWITH_PULSE_ROUTING_PLUGIN=ON \ -DWITH_PULSE_CONTROL_PLUGIN=ON \ -DWITH_ENABLED_IPC=DBUS \ -DWITH_DATABASE_STORAGE=OFF \ @@ -12,4 +13,6 @@ build-commands: - make install-commands: - make DESTDIR="$DESTDIR" install +# BuildStream builds break if files are installed to /tmp -- the element +# itself builds fine, but subsequent builds do not. - rm -R "$DESTDIR"/tmp/* -- cgit v1.2.1