0ec3a55767
This brings IoTivity to version 0.9.2 in addition it does the following: * split C and C++ Stack into two packages * backport some patches which are adding missing dependencies to the shared libs * remove patches merged upstream * add some other patches fixing some problems, most of them are already merged upstream * activate security and logging support Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
From 0143dfaa7e6dace845412e97ebbf697d273b0d10 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
|
|
Date: Tue, 21 Jul 2015 22:06:52 +0200
|
|
Subject: [PATCH] things-manager: libTGMSDKLibrary.so: add missing depending
|
|
library
|
|
|
|
libTGMSDKLibrary.so also depends on liboc.so, liboctbstack.so and
|
|
pthread, this patch adds these dependencies to the build.
|
|
|
|
Without this the dynamic loader will not automatically load these
|
|
libraries and it could result in unresolved dependencies at runtime.
|
|
|
|
Change-Id: I174b38e747be247fc25544db629f8ad2b7eb5ef5
|
|
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
|
|
Reviewed-on: https://gerrit.iotivity.org/gerrit/1795
|
|
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
|
|
Reviewed-by: Uze Choi <uzchoi@samsung.com>
|
|
---
|
|
service/things-manager/SConscript | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
--- a/service/things-manager/SConscript
|
|
+++ b/service/things-manager/SConscript
|
|
@@ -35,14 +35,17 @@ target_os = env.get('TARGET_OS')
|
|
######################################################################
|
|
things_manager_env.AppendUnique(CPPPATH = ['../../extlibs/timer', 'sdk/inc', 'sdk/src'])
|
|
|
|
+things_manager_env.PrependUnique(LIBS = ['oc', 'octbstack'])
|
|
+
|
|
if target_os not in ['windows', 'winrt']:
|
|
things_manager_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall'])
|
|
if target_os != 'android':
|
|
things_manager_env.AppendUnique(CXXFLAGS = ['-pthread'])
|
|
+ things_manager_env.AppendUnique(LIBS = ['pthread'])
|
|
|
|
if target_os == 'android':
|
|
things_manager_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
|
|
- things_manager_env.PrependUnique(LIBS = ['oc', 'octbstack', 'gnustl_shared'])
|
|
+ things_manager_env.PrependUnique(LIBS = ['gnustl_shared'])
|
|
|
|
######################################################################
|
|
# Source files and Targets
|