030-remove-check-for-curl.patch 2.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455
  1. --- a/service/resource-container/SConscript
  2. +++ b/service/resource-container/SConscript
  3. @@ -191,36 +191,22 @@ if target_os in ['linux', 'tizen', 'andr
  4. # build hue sample bundle
  5. ######################################################################
  6. -conf2 = Configure(lib_env)
  7. -if not conf2.CheckLib('curl'):
  8. - print '''X
  9. -*********************************** Error *************************************
  10. -* Cannot build hue sample. Please install libcurl.
  11. -* Example (Ubuntu):
  12. -* sudo apt-get install libcurl4-openssl-dev
  13. -* sudo ldconfig
  14. -* Hint: check with pkg-config --libs libcurl and clear scons cache.
  15. -* Skipping hue sample build.
  16. -*******************************************************************************
  17. - '''
  18. -else:
  19. - hue_resource_bundle_env = resource_container_env.Clone()
  20. - hue_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
  21. -
  22. - HUE_RESOURCE_BUNDLE_DIR = 'examples/HueSampleBundle/'
  23. - hue_resource_bundle_env.AppendUnique(CPPPATH = [
  24. - HUE_RESOURCE_BUNDLE_DIR + 'include',
  25. - 'include/'
  26. - ])
  27. -
  28. - hue_resource_bundle_env.PrependUnique(LIBS = ['curl', 'rcs_container'])
  29. -
  30. - hue_resource_bundle_src = [ Glob(HUE_RESOURCE_BUNDLE_DIR + 'src/*.cpp')]
  31. -
  32. - HueBundle = hue_resource_bundle_env.SharedLibrary('HueBundle', hue_resource_bundle_src)
  33. - hue_resource_bundle_env.InstallTarget(HueBundle, 'libHueBundle')
  34. - hue_resource_bundle_env.UserInstallTargetLib(HueBundle, 'libHueBundle')
  35. -lib_env = conf2.Finish()
  36. +hue_resource_bundle_env = resource_container_env.Clone()
  37. +hue_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
  38. +
  39. +HUE_RESOURCE_BUNDLE_DIR = 'examples/HueSampleBundle/'
  40. +hue_resource_bundle_env.AppendUnique(CPPPATH = [
  41. + HUE_RESOURCE_BUNDLE_DIR + 'include',
  42. + 'include/'
  43. + ])
  44. +
  45. +hue_resource_bundle_env.PrependUnique(LIBS = ['curl', 'rcs_container'])
  46. +
  47. +hue_resource_bundle_src = [ Glob(HUE_RESOURCE_BUNDLE_DIR + 'src/*.cpp')]
  48. +
  49. +HueBundle = hue_resource_bundle_env.SharedLibrary('HueBundle', hue_resource_bundle_src)
  50. +hue_resource_bundle_env.InstallTarget(HueBundle, 'libHueBundle')
  51. +hue_resource_bundle_env.UserInstallTargetLib(HueBundle, 'libHueBundle')
  52. ######################################################################
  53. # Build Container Sample