1e28dfe214
This does the following changes: * update to version 1.2.1 * add iotivity-resource-directory-lib, this is needed by most applications now * do not activate security support by default, this caused some problems and needs some more settings to setup. * use sqlite version from normal package feed instead of using an own version * build against LEDE version of mbedtls * update example security configuration * remove some patches that went upstream * add some new patches fixing problems observed in my environment, most of them are on their way upstream. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
32 lines
1.4 KiB
Diff
32 lines
1.4 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,6 @@ 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")
|
|
|
|
# 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
|
|
@@ -70,7 +70,6 @@ if target_os not in ['windows']:
|
|
|
|
if target_os not in ['msys_nt', 'windows']:
|
|
provisioning_env.AppendUnique(LIBS = ['dl', 'm'])
|
|
- provisioning_env.ParseConfig('pkg-config --libs glib-2.0');
|
|
provisioning_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
|
|
else:
|
|
provisioning_env.AppendUnique(LIBPATH = [os.path.join(env.get('BUILD_DIR'), 'resource', 'csdk')])
|
|
--- a/resource/csdk/security/provisioning/SConscript
|
|
+++ b/resource/csdk/security/provisioning/SConscript
|
|
@@ -73,9 +73,6 @@ provisioning_env.PrependUnique(LIBS = ['
|
|
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'])
|
|
|