diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2017-12-11 17:14:17 +0100 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2017-12-11 17:14:17 +0100 |
| commit | e24dfc26410683b59efa7500e325a4ffe724849e (patch) | |
| tree | e93a249b2914808174c05a314d8fb79f7ece84b6 /test | |
| parent | eb90438a1d4729751c0768e0b65fc8c940741d65 (diff) | |
| download | poi-service-e24dfc26410683b59efa7500e325a4ffe724849e.tar.gz | |
Fix build errors (due to new gcc)
Diffstat (limited to 'test')
5 files changed, 12 insertions, 1 deletions
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 <typeinfo> #include <getopt.h> +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include "poi-contentaccess-module-class.h" #include <QApplication> 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 <typeinfo> #include <getopt.h> +#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 <dbus-c++/glib-integration.h> #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 |