6248f9a029
This brings IoTivoity to version 1.1.0 The old @lantiq.com address does not work any more, update to the @intel.com address. The removed patches were merged upstream, but there are still some new ones needed. Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
--- a/resource/csdk/connectivity/src/bt_le_adapter/linux/SConscript
|
|
+++ b/resource/csdk/connectivity/src/bt_le_adapter/linux/SConscript
|
|
@@ -73,7 +73,7 @@ env.AppendUnique(
|
|
|
|
# The Linux BLE adapter implementation uses GDBus to make D-Bus based
|
|
# method calls to BlueZ. Pull in the necessary dependencies.
|
|
-env.ParseConfig("pkg-config gio-unix-2.0 --cflags --libs")
|
|
+# env.ParseConfig("pkg-config gio-unix-2.0 --cflags --libs")
|
|
|
|
# Set up commands to generate GDBus code from the D-Bus introspection
|
|
# XML.
|
|
--- a/resource/csdk/security/provisioning/sample/SConscript
|
|
+++ b/resource/csdk/security/provisioning/sample/SConscript
|
|
@@ -58,7 +58,7 @@ if env.get('SECURED') == '1':
|
|
if env.get('DTLS_WITH_X509') == '1':
|
|
provisioning_env.AppendUnique(LIBS = ['CKManager'])
|
|
provisioning_env.AppendUnique(LIBS = ['asn1'])
|
|
-provisioning_env.ParseConfig('pkg-config --libs glib-2.0');
|
|
+# provisioning_env.ParseConfig('pkg-config --libs glib-2.0');
|
|
|
|
provisioning_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
|
|
|
|
--- a/resource/csdk/security/provisioning/SConscript
|
|
+++ b/resource/csdk/security/provisioning/SConscript
|
|
@@ -76,8 +76,8 @@ provisioning_env.AppendUnique(LIBS = ['t
|
|
if env.get('DTLS_WITH_X509') == '1':
|
|
provisioning_env.AppendUnique(LIBS = ['CKManager', 'asn1'])
|
|
|
|
-if target_os != 'android':
|
|
- provisioning_env.ParseConfig('pkg-config --libs glib-2.0')
|
|
+# if target_os != 'android':
|
|
+# provisioning_env.ParseConfig('pkg-config --libs glib-2.0')
|
|
|
|
if target_os == 'tizen':
|
|
provisioning_env.ParseConfig('pkg-config --cflags --libs sqlite3')
|