net/iotivity/patches/030-remove-check-for-curl.patch

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