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>
55 lines
2.2 KiB
Diff
55 lines
2.2 KiB
Diff
--- a/service/resource-container/SConscript
|
|
+++ b/service/resource-container/SConscript
|
|
@@ -191,36 +191,22 @@ if target_os in ['linux', 'tizen', 'andr
|
|
# build hue sample bundle
|
|
######################################################################
|
|
|
|
-conf2 = Configure(lib_env)
|
|
-if not conf2.CheckLib('curl'):
|
|
- print '''X
|
|
-*********************************** Error *************************************
|
|
-* Cannot build hue sample. Please install libcurl.
|
|
-* Example (Ubuntu):
|
|
-* sudo apt-get install libcurl4-openssl-dev
|
|
-* sudo ldconfig
|
|
-* Hint: check with pkg-config --libs libcurl and clear scons cache.
|
|
-* Skipping hue sample build.
|
|
-*******************************************************************************
|
|
- '''
|
|
-else:
|
|
- hue_resource_bundle_env = resource_container_env.Clone()
|
|
- hue_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
|
|
-
|
|
- HUE_RESOURCE_BUNDLE_DIR = 'examples/HueSampleBundle/'
|
|
- hue_resource_bundle_env.AppendUnique(CPPPATH = [
|
|
- HUE_RESOURCE_BUNDLE_DIR + 'include',
|
|
- 'include/'
|
|
- ])
|
|
-
|
|
- hue_resource_bundle_env.PrependUnique(LIBS = ['curl', 'rcs_container'])
|
|
-
|
|
- hue_resource_bundle_src = [ Glob(HUE_RESOURCE_BUNDLE_DIR + 'src/*.cpp')]
|
|
-
|
|
- HueBundle = hue_resource_bundle_env.SharedLibrary('HueBundle', hue_resource_bundle_src)
|
|
- hue_resource_bundle_env.InstallTarget(HueBundle, 'libHueBundle')
|
|
- hue_resource_bundle_env.UserInstallTargetLib(HueBundle, 'libHueBundle')
|
|
-lib_env = conf2.Finish()
|
|
+hue_resource_bundle_env = resource_container_env.Clone()
|
|
+hue_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
|
|
+
|
|
+HUE_RESOURCE_BUNDLE_DIR = 'examples/HueSampleBundle/'
|
|
+hue_resource_bundle_env.AppendUnique(CPPPATH = [
|
|
+ HUE_RESOURCE_BUNDLE_DIR + 'include',
|
|
+ 'include/'
|
|
+ ])
|
|
+
|
|
+hue_resource_bundle_env.PrependUnique(LIBS = ['curl', 'rcs_container'])
|
|
+
|
|
+hue_resource_bundle_src = [ Glob(HUE_RESOURCE_BUNDLE_DIR + 'src/*.cpp')]
|
|
+
|
|
+HueBundle = hue_resource_bundle_env.SharedLibrary('HueBundle', hue_resource_bundle_src)
|
|
+hue_resource_bundle_env.InstallTarget(HueBundle, 'libHueBundle')
|
|
+hue_resource_bundle_env.UserInstallTargetLib(HueBundle, 'libHueBundle')
|
|
|
|
######################################################################
|
|
# Build Container Sample
|