Attachment 343407 Details for Bug 186952 – Patch

[patch] Patch

bug-186952-20180622182052.patch (text/plain), 3.73 KB, created by Keith Rollin on 2018-06-22 18:20:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2018-06-22 18:20:52 PDT

Size: 3.73 KB

patch

obsolete

>Subversion Revision: 232987
>diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
>index ae08223903376bc8c3a5c620b261b0cab4490d3a..ca8ec04e091fb4c76029a97eabc9097add495597 100644
>--- a/Source/ThirdParty/libwebrtc/ChangeLog
>+++ b/Source/ThirdParty/libwebrtc/ChangeLog
>@@ -1,3 +1,26 @@
>+2018-06-22  Keith Rollin  <krollin@apple.com>
>+
>+        Adjust webrtc library for LTO
>+        https://bugs.webkit.org/show_bug.cgi?id=186952
>+        <rdar://problem/41387815>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        There are a number of files in webrtc that have main() functions (in
>+        particular, rtpcat.cc and click_annotate.cc). When compiling with LTO,
>+        these symbols are exposed to each other, leading to the following
>+        build failure:
>+
>+            Ld libwebrtc.dylib
>+            duplicate symbol _main in:
>+            ld: 1 duplicate symbol for architecture x86_64
>+            clang: error: linker command failed with exit code 1 (use -v to see invocation)
>+            ** BUILD FAILED **
>+
>+        Address this by removing the indicated files from the build.
>+
>+        * libwebrtc.xcodeproj/project.pbxproj:
>+
> 2018-06-14  Youenn Fablet  <youenn@apple.com>
> 
>         Activate -Wexit-time-destructors -and Wglobal-constructors in libwebrtc
>diff --git a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
>index 1c68be52bfe086b2115287d636832c74cabcb217..034e57bc1667647ff1b88edb7423d8e8e9c9e493 100644
>--- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
>+++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
>@@ -2248,7 +2248,6 @@
> 		5CDD8AB71E43C00F00621E92 /* rtp_file_source.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8A8A1E43C00F00621E92 /* rtp_file_source.h */; };
> 		5CDD8AB81E43C00F00621E92 /* rtp_generator.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD8A8B1E43C00F00621E92 /* rtp_generator.cc */; };
> 		5CDD8AB91E43C00F00621E92 /* rtp_generator.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8A8C1E43C00F00621E92 /* rtp_generator.h */; };
>-		5CDD8ABA1E43C00F00621E92 /* rtpcat.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD8A8D1E43C00F00621E92 /* rtpcat.cc */; };
> 		5CDD8ACC1E43C23900621E92 /* audio_receive_stream.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD8ABD1E43C23900621E92 /* audio_receive_stream.cc */; };
> 		5CDD8ACD1E43C23900621E92 /* audio_receive_stream.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8ABE1E43C23900621E92 /* audio_receive_stream.h */; };
> 		5CDD8ACF1E43C23900621E92 /* audio_send_stream.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD8AC01E43C23900621E92 /* audio_send_stream.cc */; };
>@@ -2415,7 +2414,6 @@
> 		5CDD8C661E43C60900621E92 /* opus_inst.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8C591E43C60900621E92 /* opus_inst.h */; };
> 		5CDD8C671E43C60900621E92 /* opus_interface.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD8C5A1E43C60900621E92 /* opus_interface.c */; };
> 		5CDD8C681E43C60900621E92 /* opus_interface.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8C5B1E43C60900621E92 /* opus_interface.h */; };
>-		5CDD8C851E43C66000621E92 /* click_annotate.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD8C6C1E43C66000621E92 /* click_annotate.cc */; };
> 		5CDD8C861E43C66000621E92 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8C6D1E43C66000621E92 /* common.h */; };
> 		5CDD8C871E43C66000621E92 /* daubechies_8_wavelet_coeffs.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8C6E1E43C66000621E92 /* daubechies_8_wavelet_coeffs.h */; };
> 		5CDD8C891E43C66000621E92 /* dyadic_decimator.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8C701E43C66000621E92 /* dyadic_decimator.h */; };

Actions: View | Formatted Diff | Diff

Attachments on bug 186952: 343407 | 343462