You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

42 lines
1.8 KiB

  1. From 0143dfaa7e6dace845412e97ebbf697d273b0d10 Mon Sep 17 00:00:00 2001
  2. From: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
  3. Date: Tue, 21 Jul 2015 22:06:52 +0200
  4. Subject: [PATCH] things-manager: libTGMSDKLibrary.so: add missing depending
  5. library
  6. libTGMSDKLibrary.so also depends on liboc.so, liboctbstack.so and
  7. pthread, this patch adds these dependencies to the build.
  8. Without this the dynamic loader will not automatically load these
  9. libraries and it could result in unresolved dependencies at runtime.
  10. Change-Id: I174b38e747be247fc25544db629f8ad2b7eb5ef5
  11. Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
  12. Reviewed-on: https://gerrit.iotivity.org/gerrit/1795
  13. Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
  14. Reviewed-by: Uze Choi <uzchoi@samsung.com>
  15. ---
  16. service/things-manager/SConscript | 5 ++++-
  17. 1 file changed, 4 insertions(+), 1 deletion(-)
  18. --- a/service/things-manager/SConscript
  19. +++ b/service/things-manager/SConscript
  20. @@ -35,14 +35,17 @@ target_os = env.get('TARGET_OS')
  21. ######################################################################
  22. things_manager_env.AppendUnique(CPPPATH = ['../../extlibs/timer', 'sdk/inc', 'sdk/src'])
  23. +things_manager_env.PrependUnique(LIBS = ['oc', 'octbstack'])
  24. +
  25. if target_os not in ['windows', 'winrt']:
  26. things_manager_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall'])
  27. if target_os != 'android':
  28. things_manager_env.AppendUnique(CXXFLAGS = ['-pthread'])
  29. + things_manager_env.AppendUnique(LIBS = ['pthread'])
  30. if target_os == 'android':
  31. things_manager_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
  32. - things_manager_env.PrependUnique(LIBS = ['oc', 'octbstack', 'gnustl_shared'])
  33. + things_manager_env.PrependUnique(LIBS = ['gnustl_shared'])
  34. ######################################################################
  35. # Source files and Targets