From e24dfc26410683b59efa7500e325a4ffe724849e Mon Sep 17 00:00:00 2001 From: asanoaozora Date: Mon, 11 Dec 2017 17:14:17 +0100 Subject: Fix build errors (due to new gcc) --- src/poi-service/build.sh | 2 +- src/poi-service/poi-manager-server/run.sh | 1 + src/poi-service/poi-server-capi/main.cpp | 7 +++++-- src/poi-service/run-capi | 2 ++ src/speech/main.cpp | 3 +++ src/speech/run.sh | 1 + test/poi-service/clone_and_build.sh | 2 +- test/poi-service/poi-contentaccess-module/main.cpp | 3 +++ test/poi-service/poi-contentaccess-module/mainwindow.cpp | 3 +++ .../poi-contentaccess-module/poi-contentaccess-module-class.h | 3 +++ test/poi-service/poi-manager-client/run.sh | 2 ++ 11 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/poi-service/build.sh b/src/poi-service/build.sh index ba31142..a1f0e8a 100755 --- a/src/poi-service/build.sh +++ b/src/poi-service/build.sh @@ -56,7 +56,7 @@ function check_path_for_capi echo 'export DBUS_LIB_PATH=' exit 1 fi - commonapi_tools_option="-DDBUS_LIB_PATH="$DBUS_LIB_PATH" -DCOMMONAPI_DBUS_TOOL_DIR="$COMMONAPI_DBUS_TOOL_DIR" -DCOMMONAPI_TOOL_DIR="$COMMONAPI_TOOL_DIR + commonapi_tools_option="-DWITH_PLUGIN_MIGRATION=ON -DDBUS_LIB_PATH="$DBUS_LIB_PATH" -DCOMMONAPI_DBUS_TOOL_DIR="$COMMONAPI_DBUS_TOOL_DIR" -DCOMMONAPI_TOOL_DIR="$COMMONAPI_TOOL_DIR } while getopts cdhlmh opt diff --git a/src/poi-service/poi-manager-server/run.sh b/src/poi-service/poi-manager-server/run.sh index 4175d33..bb19e39 100755 --- a/src/poi-service/poi-manager-server/run.sh +++ b/src/poi-service/poi-manager-server/run.sh @@ -1,4 +1,5 @@ #!/bin/bash +export LD_LIBRARY_PATH=$DBUS_LIB_PATH/lib RESOURCE=../resource cp $RESOURCE/poi-database-managed.db ./bin COMMONAPI_DEFAULT_CONFIG=$RESOURCE/commonapi4dbus.ini \ diff --git a/src/poi-service/poi-server-capi/main.cpp b/src/poi-service/poi-server-capi/main.cpp index 7ef0702..1db7592 100644 --- a/src/poi-service/poi-server-capi/main.cpp +++ b/src/poi-service/poi-server-capi/main.cpp @@ -36,6 +36,9 @@ #include #include #include +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #include @@ -157,9 +160,9 @@ public: configurationChanged(changedSettings);}); myServicePOIContentAccessModule->getCategoriesRemovedEvent().subscribe([&](const std::vector< CommonTypes::CategoryID >& categories) { categoriesRemoved(categories);}); - myServicePOIContentAccessModule->getPOIAddedEvent().subscribe([&](const std::vector< POIServiceTypes::POI_ID >& pois) { + myServicePOIContentAccessModule->getPoiAddedEvent().subscribe([&](const std::vector< POIServiceTypes::POI_ID >& pois) { POIAdded(pois);}); - myServicePOIContentAccessModule->getPOIRemovedEvent().subscribe([&](const std::vector< POIServiceTypes::POI_ID >& pois) { + myServicePOIContentAccessModule->getPoiRemovedEvent().subscribe([&](const std::vector< POIServiceTypes::POI_ID >& pois) { POIRemoved(pois);}); myServicePOIContentAccessModule->getSearchStatusChangedEvent().subscribe([&](const NavigationTypes::Handle& poiSearchHandle, const POIServiceTypes::SearchStatusState& statusValue, const std::vector< POIServiceTypes::POI_ID >& pois) { searchStatusChanged(poiSearchHandle,statusValue,pois);}); diff --git a/src/poi-service/run-capi b/src/poi-service/run-capi index 6503617..80d17e4 100755 --- a/src/poi-service/run-capi +++ b/src/poi-service/run-capi @@ -26,6 +26,8 @@ # # @licence end@ +export LD_LIBRARY_PATH=$DBUS_LIB_PATH/lib + CURDIR=$PWD BIN_DIR=$CURDIR/poi-server-capi/bin diff --git a/src/speech/main.cpp b/src/speech/main.cpp index f6b3ca4..a122c71 100644 --- a/src/speech/main.cpp +++ b/src/speech/main.cpp @@ -36,6 +36,9 @@ #include #include #include +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #include #include diff --git a/src/speech/run.sh b/src/speech/run.sh index 6a6126d..d20b715 100755 --- a/src/speech/run.sh +++ b/src/speech/run.sh @@ -1,3 +1,4 @@ #!/bin/bash +export LD_LIBRARY_PATH=$DBUS_LIB_PATH/lib ./bin/speech-output-server diff --git a/test/poi-service/clone_and_build.sh b/test/poi-service/clone_and_build.sh index e864f69..2693b1c 100755 --- a/test/poi-service/clone_and_build.sh +++ b/test/poi-service/clone_and_build.sh @@ -1,6 +1,6 @@ #!/bin/bash -positioning_version='9e65831eed02cc8a1b2e2e73787d6007b54214b4' +positioning_version='d4c46f13019aefb11aebd0fc1210a29a46f0b521' echo "version of positioning is: $positioning_version" diff --git a/test/poi-service/poi-contentaccess-module/main.cpp b/test/poi-service/poi-contentaccess-module/main.cpp index cfa8ac0..e5d8e62 100644 --- a/test/poi-service/poi-contentaccess-module/main.cpp +++ b/test/poi-service/poi-contentaccess-module/main.cpp @@ -37,6 +37,9 @@ #include #include +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include "poi-contentaccess-module-class.h" #include diff --git a/test/poi-service/poi-contentaccess-module/mainwindow.cpp b/test/poi-service/poi-contentaccess-module/mainwindow.cpp index 6170fe1..d037638 100644 --- a/test/poi-service/poi-contentaccess-module/mainwindow.cpp +++ b/test/poi-service/poi-contentaccess-module/mainwindow.cpp @@ -36,6 +36,9 @@ #include #include +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include "poi-contentaccess-module-class.h" #include "mainwindow.h" diff --git a/test/poi-service/poi-contentaccess-module/poi-contentaccess-module-class.h b/test/poi-service/poi-contentaccess-module/poi-contentaccess-module-class.h index 124b1c1..d93fac5 100644 --- a/test/poi-service/poi-contentaccess-module/poi-contentaccess-module-class.h +++ b/test/poi-service/poi-contentaccess-module/poi-contentaccess-module-class.h @@ -34,6 +34,9 @@ #include "genivi-poiservice-poicontentaccess_proxy.h" #include "poi-common-dbus-data-model.h" +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #include "poi-common-database.h" diff --git a/test/poi-service/poi-manager-client/run.sh b/test/poi-service/poi-manager-client/run.sh index 215647d..2b00913 100755 --- a/test/poi-service/poi-manager-client/run.sh +++ b/test/poi-service/poi-manager-client/run.sh @@ -26,6 +26,8 @@ # # @licence end@ +export LD_LIBRARY_PATH=$DBUS_LIB_PATH/lib + CURDIR=$PWD POI_MANAGER_CLIENT_DIR=$CURDIR -- cgit v1.2.1