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.9 KiB
Diff
42 lines
1.9 KiB
Diff
From d1fb4c055f168e68ffd2d5596eef8d96f6c6cfae Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
|
|
Date: Tue, 21 Jul 2015 22:41:09 +0200
|
|
Subject: [PATCH] protocol-plugin: libfanserver_mqtt_plugin.so and
|
|
liblightserver_mqtt_plugin.so add missing depending library
|
|
|
|
libfanserver_mqtt_plugin.so and liblightserver_mqtt_plugin.so are also
|
|
depending on liboc.so and libcrypto.so, this patch adds these
|
|
dependencies to the build. In addition it puts the dependency to
|
|
mosquitto to the beginning of the list. This is needed because
|
|
mosquitto is a statically linked lib and it also has unresolved
|
|
symbols, but gcc only searches the dynamic libs defined after the
|
|
static for unresolved symbols in the static lib.
|
|
|
|
mosquitto was only build as a static linked library so we can use the
|
|
normal LIBS mechanism and it will be statically linked.
|
|
|
|
Without this the dynamic loader will not automatically load these
|
|
libraries and it could result in unresolved dependencies at runtime.
|
|
|
|
Change-Id: Ia130827d04bd3bb1a8863fc64d0097a076edc751
|
|
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
|
|
Reviewed-on: https://gerrit.iotivity.org/gerrit/1798
|
|
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
|
|
Reviewed-by: Younghyun Joo <yh_.joo@samsung.com>
|
|
Reviewed-by: Uze Choi <uzchoi@samsung.com>
|
|
---
|
|
service/protocol-plugin/plugins/SConscript | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/service/protocol-plugin/plugins/SConscript
|
|
+++ b/service/protocol-plugin/plugins/SConscript
|
|
@@ -47,8 +47,7 @@ if target_os == 'android':
|
|
plugins_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
|
|
plugins_env.AppendUnique(LIBS = ['gnustl_shared'])
|
|
|
|
-plugins_env.AppendUnique(LIBS = [File(env.get('BUILD_DIR') + '/libmosquitto.a'),
|
|
- 'mosquitto', 'ssl', 'rt'])
|
|
+plugins_env.PrependUnique(LIBS = ['mosquitto', 'ssl', 'crypto', 'rt', 'oc'])
|
|
|
|
|
|
######################################################################
|