Merge branch '1.4-rel' (1d3461a) 81/26481/2
authorPhilippe Coval <p.coval@samsung.com>
Mon, 30 Jul 2018 08:14:38 +0000 (10:14 +0200)
committerPhilippe Coval <p.coval@samsung.com>
Mon, 30 Jul 2018 08:15:23 +0000 (10:15 +0200)
Relate-to:
      Iab61b96720daa544f502a2f3598041085b775954
      I5ec710a552305e692a16d17f5bac5accc171c641
      I90f971ec1f51d7a2b7dd829c3ebd6fbd61f90c77
      Ifff1cb0c043d3ea089bfef5e1568c57edfa86c89
      I7ed76995ace68ea16e13f083b32606a1b63a2cd6
      I0cf7091c124548504e44f614da69a5d61d702002
      I8e046da345b18e5731939c9cb5e5832fa33786b7
      I8e046da345b18e5731939c9cb5e5832fa33786b6
      I2d7c4cba8408c97f2c8eb959fb3c69473e9f117a
      I1bca35ab9c516f7a0850dd209e043048d9194007
      I2e1afd6201f2047226ff5dc7911f736a240920f3
      Ifc7d3179993ad3a10cf866f0ae648c7cd4fd00c7
      Icec0d1a9c5cbf20f0adbc32745486333766234e7
      I35083f5e240ecbc6d1c731642b5c8124c5283712

Change-Id: Ifbfca9065c08f43fd8f95da43f2da347754399ce
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
build_common/SConscript
extlibs/libcoap/SConscript
resource/csdk/security/SConscript
tools/tizen/iotivity.spec

Simple merge
index bed92e5,dcd3036..dae6017
mode 100755,100644..100755
@@@ -226,55 -223,86 +226,54 @@@ else
  
          config_h_body = ''
  
 -        if ((target_os == 'windows') and (libcoap_env.get('MSVC_UWP_APP') == '1')):
 -            # Workaround for libcoap config [Investigation in IOT-2234]:
 -            # libcoap builds its config file by trying to create a small program to see if an API is
 -            # available. However, when building with store libraries on windows, it doesn't seem
 -            # to find malloc or strnlen APIs. On Windows, those APIs are guaranteed to be there,
 -            # therefore, create the libcoap config_h_body with what is needed and expected to be
 -            # there.
 -            config_h_body = '''
 -#define HAVE_ASSERT_H 1
 -
 -#define HAVE_LIMITS_H 1
 -
 -#define HAVE_STDIO_H 1
 -
 -#define HAVE_SYS_TYPES_H 1
 -
 -#define HAVE_TIME_H 1
 -
 -#define HAVE_WINSOCK2_H 1
 -
 -#define HAVE_WS2TCPIP_H 1
 -
 -#define HAVE_MALLOC 1
 -
 -#define HAVE_STRNLEN 1
 -
 -#define ssize_t SSIZE_T
 -
 -#define in_port_t uint16_t
 -'''
 -        else:
 -            cxx_headers = [
 -                'arpa/inet.h',
 -                'assert.h',
 -                'limits.h',
 -                'netinet/in.h',
 -                'stdio.h',
 -                'strings.h',
 -                'sys/select.h',
 -                'sys/socket.h',
 -                'sys/time.h',
 -                'sys/types.h',
 -                'sys/uio.h',
 -                'sys/unistd.h',
 -                'syslog.h',
 -                'time.h',
 -                'unistd.h',
 -                'winsock2.h',
 -                'ws2tcpip.h'
 -            ]
 -
 -            cxx_functions = [
 -                'malloc',
 -                'snprintf',
 -                'strnlen',
 -                'vprintf',
 -                'fls',
 -                'flsll',
 -            ]
 -
 -            def get_define_from_string(string_):
 -                string_converted = string_.replace("/", "_").replace(".", "_").upper()
 -                return "HAVE_" + string_converted
 -
 -            for header_file_name in cxx_headers:
 -                if conf.CheckCXXHeader(header_file_name):
 -                    config_h_body += "#define %s 1\n\n" % get_define_from_string(
 -                        header_file_name)
 -
 -            for function_name in cxx_functions:
 -                if conf.CheckFunc(function_name):
 -                    config_h_body += "#define %s 1\n\n" % get_define_from_string(
 -                        function_name)
 -
 -            if conf.CheckCXXHeader('windows.h'):
 -                config_h_body += "#define ssize_t SSIZE_T\n\n"
 -                config_h_body += "#define in_port_t uint16_t\n\n"
 -
 -            conf.Finish()
 -
 +        cxx_headers = [
 +            'arpa/inet.h',
 +            'assert.h',
 +            'limits.h',
 +            'netinet/in.h',
 +            'stdio.h',
 +            'strings.h',
 +            'sys/select.h',
 +            'sys/socket.h',
 +            'sys/time.h',
 +            'sys/types.h',
 +            'sys/uio.h',
 +            'sys/unistd.h',
 +            'syslog.h',
 +            'time.h',
 +            'unistd.h',
 +            'winsock2.h',
 +            'ws2tcpip.h'
 +        ]
 +
 +        cxx_functions = [
 +            'malloc',
 +            'snprintf',
 +            'strnlen',
 +            'vprintf',
 +            'fls',
 +            'flsll',
 +        ]
 +
 +        def get_define_from_string(string_):
 +            string_converted = string_.replace("/", "_").replace(".", "_").upper()
 +            return "HAVE_" + string_converted
 +
 +        for header_file_name in cxx_headers:
 +            if conf.CheckCXXHeader(header_file_name):
 +                config_h_body += "#define %s 1\n\n" % get_define_from_string(
 +                    header_file_name)
 +
 +        for function_name in cxx_functions:
 +            if conf.CheckFunc(function_name):
 +                config_h_body += "#define %s 1\n\n" % get_define_from_string(
 +                    function_name)
 +
 +        if conf.CheckCXXHeader('windows.h'):
 +            config_h_body += "#define ssize_t SSIZE_T\n\n"
 +            config_h_body += "#define in_port_t uint16_t\n\n"
 +
 +        conf.Finish()
          with open(config_h_file, "w") as configfile:
              configfile.write(config_h_header + config_h_body + config_h_footer)
  
Simple merge
Simple merge