From cf9411dbe8bb96fdb5dded383e894ca9bbb4199f Mon Sep 17 00:00:00 2001 From: Youngman Date: Thu, 23 Feb 2017 15:49:51 +0900 Subject: [PATCH] Remove unnecessary glib dependency in security Change-Id: Ic2eaca23d5d64f2433e3aaf5c1bd04767a383d66 Signed-off-by: Youngman Reviewed-on: https://gerrit.iotivity.org/gerrit/17463 Tested-by: jenkins-iotivity Reviewed-by: Phil Coval Reviewed-by: Kevin Kane --- resource/csdk/security/provisioning/SConscript | 4 ---- resource/csdk/security/provisioning/sample/SConscript | 1 - 2 files changed, 5 deletions(-) diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript index 77a588a..e94325f 100644 --- a/resource/csdk/security/provisioning/SConscript +++ b/resource/csdk/security/provisioning/SConscript @@ -50,10 +50,6 @@ provisioning_env.PrependUnique(LIBS = ['octbstack', 'oc_logger', 'connectivity_a provisioning_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509','mbedcrypto']) - -if target_os not in ['msys_nt', 'windows', 'android', 'ios']: - provisioning_env.ParseConfig('pkg-config --libs glib-2.0') - if target_os in ['windows', 'msys_nt']: provisioning_env.AppendUnique(LIBS = ['ws2_32', 'advapi32', 'iphlpapi']) diff --git a/resource/csdk/security/provisioning/sample/SConscript b/resource/csdk/security/provisioning/sample/SConscript index b1d1bb4..b8eb2cb 100644 --- a/resource/csdk/security/provisioning/sample/SConscript +++ b/resource/csdk/security/provisioning/sample/SConscript @@ -45,7 +45,6 @@ if target_os not in ['windows']: if target_os not in ['msys_nt', 'windows']: provisioning_sample_env.AppendUnique(LIBS = ['dl', 'm']) - provisioning_sample_env.ParseConfig('pkg-config --libs glib-2.0'); provisioning_sample_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) else: provisioning_sample_env.AppendUnique(LIBPATH = [os.path.join(env.get('BUILD_DIR'), 'resource', 'csdk')]) -- 2.7.4