From 9a07bfa328f977e84ff42d82a98b4bc7ebde1565 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Wed, 7 Sep 2016 10:15:46 +0200 Subject: [PATCH] tizen: Link to systemwide's sqlite Without this change, error may occurs and display this message: Linking resource/csdk/liboctbstack.so out/tizen/x86_64/release/libocsrm.a(provisioningdatabasemanager.o): In function `createDB': provisioningdatabasemanager.c:(.text+0x2c): undefined reference to `sqlite3_open_v2' Bug: https://jira.iotivity.org/browse/IOT-1260 Change-Id: I6fbb51d5746f7d02bb3fd15d337d5d91c592b4ec Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/9623 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- resource/csdk/SConscript | 2 ++ resource/csdk/security/SConscript | 17 +++++++---------- resource/csdk/security/provisioning/sample/SConscript | 1 + resource/src/SConscript | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript index f1e7b50..a9d6c0d 100644 --- a/resource/csdk/SConscript +++ b/resource/csdk/SConscript @@ -118,6 +118,8 @@ else: if target_os in ['tizen', 'linux']: liboctbstack_env.ParseConfig("pkg-config --cflags --libs uuid") +if target_os in ['tizen']: + liboctbstack_env.ParseConfig('pkg-config --cflags --libs sqlite3') if target_os == 'arduino': liboctbstack_env.AppendUnique(CPPDEFINES = ['NDEBUG', 'WITH_ARDUINO']) diff --git a/resource/csdk/security/SConscript b/resource/csdk/security/SConscript index 4abd6a0..2e5e55e 100644 --- a/resource/csdk/security/SConscript +++ b/resource/csdk/security/SConscript @@ -58,9 +58,6 @@ libocsrm_env.PrependUnique(CPPPATH = [ '../security/provisioning/include' ]) -if env.get('SECURED') == '1' and target_os not in ['tizen']: - libocsrm_env.AppendUnique(CPPPATH = ['../../../extlibs/sqlite3']) - if target_os not in ['arduino', 'windows']: libocsrm_env.AppendUnique(CPPDEFINES = ['WITH_POSIX']) libocsrm_env.AppendUnique(CFLAGS = ['-std=c99', '-Wall']) @@ -114,14 +111,14 @@ libocsrm_src = [ OCSRM_SRC + 'directpairing.c' ] -if env.get('SECURED') == '1': +if libocsrm_env.get('SECURED') == '1': + if target_os in ['tizen']: + libocsrm_env.ParseConfig('pkg-config --cflags --libs sqlite3') + else: + libocsrm_env.AppendUnique(CPPPATH = ['../../../extlibs/sqlite3']) + libocsrm_src = libocsrm_src + ['../../../extlibs/sqlite3/sqlite3.c'] libocsrm_src = libocsrm_src + [OCSRM_SRC + 'provisioningdatabasemanager.c'] - -if env.get('SECURED') == '1' and target_os != 'tizen': - libocsrm_src = libocsrm_src + ['../../../extlibs/sqlite3/sqlite3.c'] - -if env.get('SECURED') == '1': - libocsrm_src = libocsrm_src + [OCSRM_SRC + 'oxmpincommon.c', OCSRM_SRC + 'pbkdf2.c'] + libocsrm_src = libocsrm_src + [OCSRM_SRC + 'oxmpincommon.c', OCSRM_SRC + 'pbkdf2.c'] if target_os in ['windows', 'msys_nt']: libocsrm_src = libocsrm_src + [OCSRM_SRC + 'strptime.c'] diff --git a/resource/csdk/security/provisioning/sample/SConscript b/resource/csdk/security/provisioning/sample/SConscript index 23818ff..731d45f 100644 --- a/resource/csdk/security/provisioning/sample/SConscript +++ b/resource/csdk/security/provisioning/sample/SConscript @@ -82,6 +82,7 @@ provisioning_env.AppendUnique(CPPDEFINES = ['TB_LOG']) if target_os == 'tizen': provisioning_env.AppendUnique(CPPDEFINES = ['__TIZEN__']) + provisioning_env.ParseConfig('pkg-config --cflags --libs sqlite3') ###################################################################### # Source files and Targets diff --git a/resource/src/SConscript b/resource/src/SConscript index cdf7d7c..301e7df 100644 --- a/resource/src/SConscript +++ b/resource/src/SConscript @@ -67,6 +67,7 @@ if target_os == 'android': if target_os == 'tizen': oclib_env.AppendUnique(CPPDEFINES = ['__TIZEN__']) + oclib_env.ParseConfig('pkg-config --cflags --libs sqlite3') if target_os in ['linux'] and oclib_env.get('SIMULATOR', False): oclib_env.Append( RPATH = oclib_env.Literal('\\$$ORIGIN')) -- 2.7.4