Changeset 211817 in webkit


Ignore:
Timestamp:
Feb 7, 2017 10:24:02 AM (7 years ago)
Author:
achristensen@apple.com
Message:

build usrsctp with Xcode
​https://bugs.webkit.org/show_bug.cgi?id=167944

Reviewed by Youenn Fablet.

  • Configurations/usrsctp.xcconfig:
  • Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c:
  • Source/third_party/usrsctp/usrsctplib/usrsctplib/user_atomic.h:
  • libwebrtc.xcodeproj/project.pbxproj:
Location:
trunk/Source/ThirdParty/libwebrtc
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r211749 r211817  
     12017-02-07  Alex Christensen  <achristensen@webkit.org>
     2
     3        build usrsctp with Xcode
     4        https://bugs.webkit.org/show_bug.cgi?id=167944
     5
     6        Reviewed by Youenn Fablet.
     7
     8        * Configurations/usrsctp.xcconfig:
     9        * Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c:
     10        * Source/third_party/usrsctp/usrsctplib/usrsctplib/user_atomic.h:
     11        * libwebrtc.xcodeproj/project.pbxproj:
     12
    1132017-02-06  Alex Christensen  <achristensen@webkit.org>
    214

  • trunk/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig

    r211664 r211817  
    1111PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libwebrtc;
    1212USE_HEADERMAP = NO;
    13 WARNING_CFLAGS = -Wno-exit-time-destructors -Wno-implicit-function-declaration -Wno-incompatible-pointer-types
    14 GCC_PREPROCESSOR_DEFINITIONS = __Userspace_os_Darwin SCTP_SIMPLE_ALLOCATOR;
     13WARNING_CFLAGS = -Wno-exit-time-destructors -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -Wno-deprecated-declarations;
     14GCC_PREPROCESSOR_DEFINITIONS = __Userspace_os_Darwin SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292;
     15OTHER_CFLAGS = -UINET -UINET6 -U__APPLE__;

  • trunk/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_pcb.c

    r210942 r211817  
    68466846#if defined(__Userspace__)
    68476847        mbuf_init(NULL);
    6848         atomic_init();
     6848    // atomic_init();
    68496849#if defined(INET) || defined(INET6)
    68506850        recv_thread_init();

  • trunk/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/user_atomic.h

    r210942 r211817  
    8181static void atomic_init() {} /* empty when we are not using atomic_mtx */
    8282#else
    83 static inline void atomic_init() {} /* empty when we are not using atomic_mtx */
     83// static inline void atomic_init() {} /* empty when we are not using atomic_mtx */
    8484#endif
    8585

  • trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj

    r211664 r211817  
    675675                5C4B4D851E4323D4002651C8 /* scale.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4D591E4323D4002651C8 /* scale.cc */; };
    676676                5C4B4D861E4323D4002651C8 /* video_common.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4D5A1E4323D4002651C8 /* video_common.cc */; };
     677                5C60245F1E494DB80088F0B2 /* user_atomic.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4ACB1E42C9D6002651C8 /* user_atomic.h */; };
     678                5C6024601E494DB80088F0B2 /* user_environment.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4ACC1E42C9D6002651C8 /* user_environment.c */; };
     679                5C6024611E494DB80088F0B2 /* user_environment.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4ACD1E42C9D6002651C8 /* user_environment.h */; };
     680                5C6024621E494DB80088F0B2 /* user_inpcb.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4ACE1E42C9D6002651C8 /* user_inpcb.h */; };
     681                5C6024631E494DB80088F0B2 /* user_ip6_var.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AD01E42C9D6002651C8 /* user_ip6_var.h */; };
     682                5C6024641E494DB80088F0B2 /* user_ip_icmp.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4ACF1E42C9D6002651C8 /* user_ip_icmp.h */; };
     683                5C6024651E494DB80088F0B2 /* user_malloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AD11E42C9D6002651C8 /* user_malloc.h */; };
     684                5C6024661E494DB80088F0B2 /* user_mbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4AD21E42C9D6002651C8 /* user_mbuf.c */; };
     685                5C6024671E494DB80088F0B2 /* user_mbuf.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AD31E42C9D6002651C8 /* user_mbuf.h */; };
     686                5C6024681E494DB80088F0B2 /* user_queue.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AD41E42C9D6002651C8 /* user_queue.h */; };
     687                5C6024691E494DB80088F0B2 /* user_recv_thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4AD51E42C9D6002651C8 /* user_recv_thread.c */; };
     688                5C60246A1E494DB80088F0B2 /* user_recv_thread.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AD61E42C9D6002651C8 /* user_recv_thread.h */; };
     689                5C60246B1E494DB80088F0B2 /* user_route.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AD71E42C9D6002651C8 /* user_route.h */; };
     690                5C60246C1E494DB80088F0B2 /* user_socketvar.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AD91E42C9D6002651C8 /* user_socketvar.h */; };
     691                5C60246D1E494DB80088F0B2 /* user_uma.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4ADA1E42C9D6002651C8 /* user_uma.h */; };
     692                5C60246E1E494DB80088F0B2 /* usrsctp.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4ADB1E42C9D6002651C8 /* usrsctp.h */; };
     693                5C60246F1E4950A00088F0B2 /* sctp.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B151E42C9EF002651C8 /* sctp.h */; };
     694                5C6024701E4950A00088F0B2 /* sctp_asconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4AEE1E42C9EF002651C8 /* sctp_asconf.c */; };
     695                5C6024711E4950A00088F0B2 /* sctp_asconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AEF1E42C9EF002651C8 /* sctp_asconf.h */; };
     696                5C6024721E4950A00088F0B2 /* sctp_auth.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4AF01E42C9EF002651C8 /* sctp_auth.c */; };
     697                5C6024731E4950A00088F0B2 /* sctp_auth.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AF11E42C9EF002651C8 /* sctp_auth.h */; };
     698                5C6024741E4950A00088F0B2 /* sctp_bsd_addr.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4AF21E42C9EF002651C8 /* sctp_bsd_addr.c */; };
     699                5C6024751E4950A00088F0B2 /* sctp_bsd_addr.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AF31E42C9EF002651C8 /* sctp_bsd_addr.h */; };
     700                5C6024761E4950A00088F0B2 /* sctp_callout.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4AF41E42C9EF002651C8 /* sctp_callout.c */; };
     701                5C6024771E4950A00088F0B2 /* sctp_callout.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AF51E42C9EF002651C8 /* sctp_callout.h */; };
     702                5C6024781E4950A00088F0B2 /* sctp_cc_functions.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4AF61E42C9EF002651C8 /* sctp_cc_functions.c */; };
     703                5C6024791E4950A00088F0B2 /* sctp_constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AF71E42C9EF002651C8 /* sctp_constants.h */; };
     704                5C60247A1E4950A00088F0B2 /* sctp_crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4AF81E42C9EF002651C8 /* sctp_crc32.c */; };
     705                5C60247B1E4950A00088F0B2 /* sctp_crc32.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AF91E42C9EF002651C8 /* sctp_crc32.h */; };
     706                5C60247C1E4950A00088F0B2 /* sctp_header.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AFA1E42C9EF002651C8 /* sctp_header.h */; };
     707                5C60247D1E4950A00088F0B2 /* sctp_indata.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AFC1E42C9EF002651C8 /* sctp_indata.h */; };
     708                5C60247E1E4950A00088F0B2 /* sctp_input.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4AFD1E42C9EF002651C8 /* sctp_input.c */; };
     709                5C60247F1E4950A00088F0B2 /* sctp_input.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AFE1E42C9EF002651C8 /* sctp_input.h */; };
     710                5C6024801E4950A00088F0B2 /* sctp_lock_userspace.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4AFF1E42C9EF002651C8 /* sctp_lock_userspace.h */; };
     711                5C6024811E4950A00088F0B2 /* sctp_os.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B011E42C9EF002651C8 /* sctp_os.h */; };
     712                5C6024821E4950A00088F0B2 /* sctp_os_userspace.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B001E42C9EF002651C8 /* sctp_os_userspace.h */; };
     713                5C6024831E4950A00088F0B2 /* sctp_output.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4B021E42C9EF002651C8 /* sctp_output.c */; };
     714                5C6024841E4950A00088F0B2 /* sctp_output.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B031E42C9EF002651C8 /* sctp_output.h */; };
     715                5C6024861E4950A00088F0B2 /* sctp_pcb.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B051E42C9EF002651C8 /* sctp_pcb.h */; };
     716                5C6024871E4950A00088F0B2 /* sctp_peeloff.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4B061E42C9EF002651C8 /* sctp_peeloff.c */; };
     717                5C6024881E4950A00088F0B2 /* sctp_peeloff.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B071E42C9EF002651C8 /* sctp_peeloff.h */; };
     718                5C6024891E4950A00088F0B2 /* sctp_process_lock.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B081E42C9EF002651C8 /* sctp_process_lock.h */; };
     719                5C60248A1E4950A00088F0B2 /* sctp_sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4B091E42C9EF002651C8 /* sctp_sha1.c */; };
     720                5C60248B1E4950A00088F0B2 /* sctp_sha1.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B0A1E42C9EF002651C8 /* sctp_sha1.h */; };
     721                5C60248C1E4950A00088F0B2 /* sctp_ss_functions.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4B0B1E42C9EF002651C8 /* sctp_ss_functions.c */; };
     722                5C60248D1E4950A00088F0B2 /* sctp_structs.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B0C1E42C9EF002651C8 /* sctp_structs.h */; };
     723                5C60248E1E4950A00088F0B2 /* sctp_sysctl.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4B0D1E42C9EF002651C8 /* sctp_sysctl.c */; };
     724                5C60248F1E4950A00088F0B2 /* sctp_sysctl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B0E1E42C9EF002651C8 /* sctp_sysctl.h */; };
     725                5C6024901E4950A00088F0B2 /* sctp_timer.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4B0F1E42C9EF002651C8 /* sctp_timer.c */; };
     726                5C6024911E4950A00088F0B2 /* sctp_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B101E42C9EF002651C8 /* sctp_timer.h */; };
     727                5C6024921E4950A00088F0B2 /* sctp_uio.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B111E42C9EF002651C8 /* sctp_uio.h */; };
     728                5C6024931E4950A00088F0B2 /* sctp_usrreq.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4B131E42C9EF002651C8 /* sctp_usrreq.c */; };
     729                5C6024941E4950A00088F0B2 /* sctp_var.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B141E42C9EF002651C8 /* sctp_var.h */; };
     730                5C6024951E4950A00088F0B2 /* sctputil.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4B161E42C9EF002651C8 /* sctputil.c */; };
     731                5C6024961E4950A00088F0B2 /* sctputil.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B171E42C9EF002651C8 /* sctputil.h */; };
     732                5C6024971E4950A50088F0B2 /* sctp6_usrreq.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4B431E42CA00002651C8 /* sctp6_usrreq.c */; };
     733                5C6024981E4950A50088F0B2 /* sctp6_var.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B4B441E42CA00002651C8 /* sctp6_var.h */; };
     734                5C6024991E4951610088F0B2 /* sctp_pcb.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4B041E42C9EF002651C8 /* sctp_pcb.c */; };
    677735                5C63F5CC1E414811002CA531 /* scoped_ref_ptr.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C63F4221E414810002CA531 /* scoped_ref_ptr.h */; };
    678736                5C63F66B1E415F9B002CA531 /* thread.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C63F6691E415F9B002CA531 /* thread.cc */; };
    … …  
    88968954                        buildActionMask = 2147483647;
    88978955                        files = (
     8956                                5C60247B1E4950A00088F0B2 /* sctp_crc32.h in Headers */,
     8957                                5C6024921E4950A00088F0B2 /* sctp_uio.h in Headers */,
     8958                                5C60245F1E494DB80088F0B2 /* user_atomic.h in Headers */,
     8959                                5C60246B1E494DB80088F0B2 /* user_route.h in Headers */,
     8960                                5C6024641E494DB80088F0B2 /* user_ip_icmp.h in Headers */,
     8961                                5C6024771E4950A00088F0B2 /* sctp_callout.h in Headers */,
     8962                                5C6024671E494DB80088F0B2 /* user_mbuf.h in Headers */,
     8963                                5C6024631E494DB80088F0B2 /* user_ip6_var.h in Headers */,
     8964                                5C60247D1E4950A00088F0B2 /* sctp_indata.h in Headers */,
     8965                                5C6024751E4950A00088F0B2 /* sctp_bsd_addr.h in Headers */,
     8966                                5C6024651E494DB80088F0B2 /* user_malloc.h in Headers */,
     8967                                5C6024881E4950A00088F0B2 /* sctp_peeloff.h in Headers */,
     8968                                5C60247C1E4950A00088F0B2 /* sctp_header.h in Headers */,
     8969                                5C60246A1E494DB80088F0B2 /* user_recv_thread.h in Headers */,
     8970                                5C6024961E4950A00088F0B2 /* sctputil.h in Headers */,
     8971                                5C6024841E4950A00088F0B2 /* sctp_output.h in Headers */,
     8972                                5C6024791E4950A00088F0B2 /* sctp_constants.h in Headers */,
     8973                                5C6024981E4950A50088F0B2 /* sctp6_var.h in Headers */,
     8974                                5C6024891E4950A00088F0B2 /* sctp_process_lock.h in Headers */,
     8975                                5C60246C1E494DB80088F0B2 /* user_socketvar.h in Headers */,
     8976                                5C6024681E494DB80088F0B2 /* user_queue.h in Headers */,
     8977                                5C60246E1E494DB80088F0B2 /* usrsctp.h in Headers */,
     8978                                5C60248B1E4950A00088F0B2 /* sctp_sha1.h in Headers */,
     8979                                5C6024711E4950A00088F0B2 /* sctp_asconf.h in Headers */,
     8980                                5C6024941E4950A00088F0B2 /* sctp_var.h in Headers */,
     8981                                5C60248D1E4950A00088F0B2 /* sctp_structs.h in Headers */,
     8982                                5C60246D1E494DB80088F0B2 /* user_uma.h in Headers */,
     8983                                5C6024821E4950A00088F0B2 /* sctp_os_userspace.h in Headers */,
     8984                                5C6024731E4950A00088F0B2 /* sctp_auth.h in Headers */,
     8985                                5C6024811E4950A00088F0B2 /* sctp_os.h in Headers */,
     8986                                5C6024911E4950A00088F0B2 /* sctp_timer.h in Headers */,
     8987                                5C6024861E4950A00088F0B2 /* sctp_pcb.h in Headers */,
     8988                                5C6024611E494DB80088F0B2 /* user_environment.h in Headers */,
     8989                                5C60248F1E4950A00088F0B2 /* sctp_sysctl.h in Headers */,
     8990                                5C60247F1E4950A00088F0B2 /* sctp_input.h in Headers */,
     8991                                5C60246F1E4950A00088F0B2 /* sctp.h in Headers */,
     8992                                5C6024621E494DB80088F0B2 /* user_inpcb.h in Headers */,
     8993                                5C6024801E4950A00088F0B2 /* sctp_lock_userspace.h in Headers */,
    88988994                        );
    88998995                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1005410150                        buildActionMask = 2147483647;
    1005510151                        files = (
     10152                                5C6024971E4950A50088F0B2 /* sctp6_usrreq.c in Sources */,
     10153                                5C6024991E4951610088F0B2 /* sctp_pcb.c in Sources */,
     10154                                5C6024661E494DB80088F0B2 /* user_mbuf.c in Sources */,
     10155                                5C6024701E4950A00088F0B2 /* sctp_asconf.c in Sources */,
     10156                                5C6024691E494DB80088F0B2 /* user_recv_thread.c in Sources */,
     10157                                5C6024951E4950A00088F0B2 /* sctputil.c in Sources */,
     10158                                5C6024931E4950A00088F0B2 /* sctp_usrreq.c in Sources */,
     10159                                5C60247A1E4950A00088F0B2 /* sctp_crc32.c in Sources */,
     10160                                5C60247E1E4950A00088F0B2 /* sctp_input.c in Sources */,
     10161                                5C6024781E4950A00088F0B2 /* sctp_cc_functions.c in Sources */,
     10162                                5C6024721E4950A00088F0B2 /* sctp_auth.c in Sources */,
     10163                                5C6024741E4950A00088F0B2 /* sctp_bsd_addr.c in Sources */,
     10164                                5C6024761E4950A00088F0B2 /* sctp_callout.c in Sources */,
     10165                                5C6024901E4950A00088F0B2 /* sctp_timer.c in Sources */,
     10166                                5C60248E1E4950A00088F0B2 /* sctp_sysctl.c in Sources */,
     10167                                5C60248C1E4950A00088F0B2 /* sctp_ss_functions.c in Sources */,
     10168                                5C60248A1E4950A00088F0B2 /* sctp_sha1.c in Sources */,
     10169                                5C6024871E4950A00088F0B2 /* sctp_peeloff.c in Sources */,
     10170                                5C6024601E494DB80088F0B2 /* user_environment.c in Sources */,
     10171                                5C6024831E4950A00088F0B2 /* sctp_output.c in Sources */,
    1005610172                        );
    1005710173                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1150211618                        baseConfigurationReference = 5C11A0331E4576A9004F0987 /* usrsctp.xcconfig */;
    1150311619                        buildSettings = {
    11504                                 OTHER_CFLAGS = "";
    1150511620                                PRODUCT_NAME = "$(TARGET_NAME)";
    1150611621                        };
    … …  
    1151111626                        baseConfigurationReference = 5C11A0331E4576A9004F0987 /* usrsctp.xcconfig */;
    1151211627                        buildSettings = {
    11513                                 OTHER_CFLAGS = "";
    1151411628                                PRODUCT_NAME = "$(TARGET_NAME)";
    1151511629                        };
    … …  
    1152011634                        baseConfigurationReference = 5C11A0331E4576A9004F0987 /* usrsctp.xcconfig */;
    1152111635                        buildSettings = {
    11522                                 OTHER_CFLAGS = "";
    1152311636                                PRODUCT_NAME = "$(TARGET_NAME)";
    1152411637                        };
Note: See TracChangeset for help on using the changeset viewer.