From: Thiago Macieira Date: Wed, 6 May 2015 23:25:55 +0000 (-0700) Subject: Fix linking of liboctbstack: conectivity_abstraction requires coap X-Git-Tag: 1.2.0+RC1~1741 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc13459fc291d861edd3751a8d4af81ff20962ce;p=platform%2Fupstream%2Fiotivity.git Fix linking of liboctbstack: conectivity_abstraction requires coap The order in which static libraries are listed matters, so connectivity_abstraction needs to appear before coap. This also solves the problem on iOS that caused libcoap to be moved to later. Change-Id: I0d4913955e3745b69672ffff13dbc5d38a438ef6 Signed-off-by: Thiago Macieira Reviewed-on: https://gerrit.iotivity.org/gerrit/920 Reviewed-by: Charlie Lenahan Tested-by: jenkins-iotivity Reviewed-by: Caiwen Zhang Reviewed-by: Erich Keane --- diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript index 27a8393..5004f84 100644 --- a/resource/csdk/SConscript +++ b/resource/csdk/SConscript @@ -62,6 +62,9 @@ if target_os not in ['windows', 'winrt']: liboctbstack_env.AppendUnique(CFLAGS = ['-Wall']) liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) + +if target_os in ['android', 'linux']: + liboctbstack_env.AppendUnique(LIBS = ['connectivity_abstraction']) liboctbstack_env.AppendUnique(LIBS = ['coap', 'm']) if target_os not in ['android', 'arduino', 'windows', 'winrt']: @@ -71,12 +74,9 @@ if target_os == 'arduino': liboctbstack_env.AppendUnique(CPPDEFINES = ['NDEBUG', 'WITH_ARDUINO']) elif target_os not in ['darwin','ios']: liboctbstack_env.AppendUnique(CFLAGS = ['-fPIC']) -if target_os in ['android', 'linux']: - liboctbstack_env.AppendUnique(LIBS = ['connectivity_abstraction']) if target_os in ['darwin', 'ios']: liboctbstack_env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE']) liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) - liboctbstack_env.AppendUnique(LIBS = ['coap']) if env.get('SECURED') == '1': liboctbstack_env.AppendUnique(LIBS = ['tinydtls'])