From 2ac3683611bdaf82887c8e12f6dc157827e37730 Mon Sep 17 00:00:00 2001 From: "sy01.youn" Date: Mon, 5 Dec 2016 10:39:58 +0900 Subject: [PATCH] EasySetup Tizen Sample App. Build Script is fixed. There was a build error when building enrollee sample app based on tizen, because of missing ocrandom.h file in iotivity.spec file. Change-Id: I3e20cac04d2691d58fc291ea88e2983845e9fbd6 Signed-off-by: sy01.youn Reviewed-on: https://gerrit.iotivity.org/gerrit/15127 Tested-by: jenkins-iotivity Reviewed-by: JunHo Lee Reviewed-by: Uze Choi --- .../sampleapp/enrollee/tizen-sdb/EnrolleeSample/scons/SConscript | 4 ++-- tools/tizen/iotivity.spec | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/scons/SConscript b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/scons/SConscript index 981d6b0..d588e2b 100644 --- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/scons/SConscript +++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/scons/SConscript @@ -30,7 +30,7 @@ build_dir = env.get('BUILD_DIR') sample_dir = build_dir env.ParseConfig("pkg-config --cflags --libs capi-network-wifi dlog gobject-2.0 gio-2.0 gthread-2.0 glib-2.0") -env.AppendUnique(CPPFLAGS = ['-std=c++0x', '-fPIC', '-D__TIZEN__','-DWITH_POSIX', '-Wall', '-DSLP_SDK_LOG', '-g','-D_GNU_SOURCE','-DTIZEN_DEBUG_ENABLE', '-DTB_LOG','`pkg-config', '--cflags', '--libs','dlog','capi-network-wifi', +env.AppendUnique(CPPFLAGS = ['-fPIC', '-D__TIZEN__','-DWITH_POSIX', '-Wall', '-DSLP_SDK_LOG', '-g','-D_GNU_SOURCE','-DTIZEN_DEBUG_ENABLE', '-DTB_LOG','`pkg-config', '--cflags', '--libs','dlog','capi-network-wifi', 'gobject-2.0', 'gio-2.0', 'gthread-2.0', 'glib-2.0`']) env.AppendUnique(CPPDEFINES = ['TB_LOG']) @@ -43,7 +43,7 @@ elif routing == 'EP': env.AppendUnique(CPPDEFINES = ['ROUTING_EP']) env.Append(LIBS=['-lgobject-2.0', '-lglib-2.0', '-lgio-2.0', '-lgthread-2.0']) -env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connectivity_abstraction','coap', 'libESEnrolleeSDK','pthread']) +env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connectivity_abstraction','coap','rt','libESEnrolleeSDK','pthread']) if secured == '1': env.PrependUnique(CPPPATH = [root_dir + '/external/inc/']) diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec index 738299c..69052fa 100644 --- a/tools/tizen/iotivity.spec +++ b/tools/tizen/iotivity.spec @@ -252,6 +252,7 @@ cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat %endif cp resource/c_common/*.h %{buildroot}%{_includedir} +cp resource/c_common/ocrandom/include/*.h %{buildroot}%{_includedir} cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir} cp resource/csdk/logger/include/*.h %{buildroot}%{_includedir} -- 2.7.4