[WebRTC] Use HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE for libwebrtc
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Jan 2017 02:18:01 +0000 (02:18 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Jan 2017 02:18:01 +0000 (02:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=167353

Patch by Youenn Fablet <youenn@apple.com> on 2017-01-24
Reviewed by Alex Christensen.

Source/ThirdParty/libwebrtc:

* CMakeLists.txt:

Tools:

* Scripts/webkitpy/libwebrtc/generate_cmake.py:
(CMakeGenerator.initialize_targets):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@211127 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/libwebrtc/CMakeLists.txt
Source/ThirdParty/libwebrtc/ChangeLog
Tools/ChangeLog
Tools/Scripts/webkitpy/libwebrtc/generate_cmake.py

index 735339f..07e790e 100644 (file)
@@ -2747,7 +2747,7 @@ set(WebrtcBaseRtc_Base_Approved_SOURCES ${LIBWEBRTC_INPUT_DIR}/webrtc/base/base6
     ${LIBWEBRTC_INPUT_DIR}/webrtc/base/logging_mac.mm)
 add_library(WebrtcBaseRtc_Base_Approved STATIC ${WebrtcBaseRtc_Base_Approved_SOURCES})
 target_compile_options(WebrtcBaseRtc_Base_Approved PRIVATE "-fno-strict-aliasing" "-fstack-protector-strong" "-fcolor-diagnostics" "-arch" "x86_64" "-gdwarf-2" "-mmacosx-version-min=10.9" "-Wall" "-Werror" "-Wextra" "-Wpartial-availability" "-Wno-missing-field-initializers" "-Wno-unused-parameter" "-Wno-c++11-narrowing" "-Wno-covered-switch-default" "-Wno-deprecated-register" "-Wno-unneeded-internal-declaration" "-Wno-inconsistent-missing-override" "-Wno-shift-negative-value" "-O0" "-fvisibility=hidden" "-Wheader-hygiene" "-Wstring-conversion" "-Wno-strict-overflow" "-Wimplicit-fallthrough" "-Wthread-safety" "-Winconsistent-missing-override" "-Wundef" "-std=c99" "-fno-threadsafe-statics" "-fvisibility-inlines-hidden" "-Wno-undefined-bool-conversion" "-Wno-tautological-undefined-compare" "-stdlib=libc++" "-fno-rtti" "-fno-exceptions" "-Wnon-virtual-dtor" "-Woverloaded-virtual" "-Wobjc-missing-property-synthesis" "-fobjc-call-cxx-cdtors")
-target_compile_definitions(WebrtcBaseRtc_Base_Approved PRIVATE V8_DEPRECATION_WARNINGS ENABLE_NOTIFICATIONS ENABLE_PLUGINS=1 ENABLE_PDF=1 ENABLE_PRINTING=1 ENABLE_BASIC_PRINTING=1 ENABLE_PRINT_PREVIEW=1 ENABLE_SPELLCHECK=1 USE_BROWSER_SPELLCHECKER=1 NO_TCMALLOC USE_EXTERNAL_POPUP_MENU=1 ENABLE_WEBRTC=1 ENABLE_EXTENSIONS=1 ENABLE_TASK_MANAGER=1 ENABLE_THEMES=1 ENABLE_SESSION_SERVICE=1 ENABLE_SUPERVISED_USERS=1 FULL_SAFE_BROWSING SAFE_BROWSING_CSD SAFE_BROWSING_DB_LOCAL CHROMIUM_BUILD ENABLE_MEDIA_ROUTER=1 FIELDTRIAL_TESTING_ENABLED CR_CLANG_REVISION=284979-1 CR_XCODE_VERSION=0820 __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 _DEBUG DYNAMIC_ANNOTATIONS_ENABLED=1 WTF_USE_DYNAMIC_ANNOTATIONS=1 WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE EXPAT_RELATIVE_PATH RTC_DISABLE_VP9 WEBRTC_POSIX WEBRTC_MAC)
+target_compile_definitions(WebrtcBaseRtc_Base_Approved PRIVATE V8_DEPRECATION_WARNINGS ENABLE_NOTIFICATIONS ENABLE_PLUGINS=1 ENABLE_PDF=1 ENABLE_PRINTING=1 ENABLE_BASIC_PRINTING=1 ENABLE_PRINT_PREVIEW=1 ENABLE_SPELLCHECK=1 USE_BROWSER_SPELLCHECKER=1 NO_TCMALLOC USE_EXTERNAL_POPUP_MENU=1 ENABLE_WEBRTC=1 ENABLE_EXTENSIONS=1 ENABLE_TASK_MANAGER=1 ENABLE_THEMES=1 ENABLE_SESSION_SERVICE=1 ENABLE_SUPERVISED_USERS=1 FULL_SAFE_BROWSING SAFE_BROWSING_CSD SAFE_BROWSING_DB_LOCAL CHROMIUM_BUILD ENABLE_MEDIA_ROUTER=1 FIELDTRIAL_TESTING_ENABLED CR_CLANG_REVISION=284979-1 CR_XCODE_VERSION=0820 __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 _DEBUG DYNAMIC_ANNOTATIONS_ENABLED=1 WTF_USE_DYNAMIC_ANNOTATIONS=1 WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE EXPAT_RELATIVE_PATH RTC_DISABLE_VP9 WEBRTC_POSIX WEBRTC_MAC HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE)
 target_include_directories(WebrtcBaseRtc_Base_Approved PRIVATE ${LIBWEBRTC_INPUT_DIR}/ ${LIBWEBRTC_OUTPUT_DIR}/gen/)
 set_target_properties(WebrtcBaseRtc_Base_Approved PROPERTIES LINK_FLAGS "-stdlib=libc++ -arch x86_64 -mmacosx-version-min=10.9")
 set_target_properties(WebrtcBaseRtc_Base_Approved PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${LIBWEBRTC_OUTPUT_DIR}/obj/webrtc/base)
index f0e0b0f..3dc94af 100644 (file)
@@ -1,3 +1,12 @@
+2017-01-24  Youenn Fablet  <youenn@apple.com>
+
+        [WebRTC] Use HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE for libwebrtc
+        https://bugs.webkit.org/show_bug.cgi?id=167353
+
+        Reviewed by Alex Christensen.
+
+        * CMakeLists.txt:
+
 2017-01-23  Youenn Fablet  <youenn@apple.com>
 
         [WebRTC] Filter libwebrtc link flags
index 253e969..8f9fd3a 100644 (file)
@@ -1,3 +1,13 @@
+2017-01-24  Youenn Fablet  <youenn@apple.com>
+
+        [WebRTC] Use HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE for libwebrtc
+        https://bugs.webkit.org/show_bug.cgi?id=167353
+
+        Reviewed by Alex Christensen.
+
+        * Scripts/webkitpy/libwebrtc/generate_cmake.py:
+        (CMakeGenerator.initialize_targets):
+
 2017-01-24  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         WKR should not confuse Miguel Gomez with Andres Gomez
index ba8acf4..8b8c5c0 100644 (file)
@@ -160,6 +160,8 @@ class CMakeGenerator(object):
         self.remove_webrtc_base_sha1()
         self.targets.pop("//build/config/sanitizers:options_sources")
 
+        self.targets["//webrtc/base:rtc_base_approved"]["defines"].append("HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE")
+
     def _remove_target(self, targetName):
         self.targets.pop(targetName)
         for name, target in self.targets.iteritems():