<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213468] trunk/Source/ThirdParty/libwebrtc</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213468">213468</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-03-06 14:46:57 -0800 (Mon, 06 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Production libwebrtc build after <a href="http://trac.webkit.org/projects/webkit/changeset/213418">r213418</a>
https://bugs.webkit.org/show_bug.cgi?id=169217
<rdar://problem/30876775>
Reviewed by Tim Horton.
* Source/webrtc/base/checks.h:
* libwebrtc.xcodeproj/project.pbxproj:
MakeCheckOpString was a weak export, and it wasn't needed.
There is an internal build that checks for weak exports and fails if there is one.
Run the check-for-weak-vtables-and-externals script for libwebrtc.dylib like we do for the other frameworks.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartylibwebrtcChangeLog">trunk/Source/ThirdParty/libwebrtc/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcewebrtcbasechecksh">trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/checks.h</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtclibwebrtcxcodeprojprojectpbxproj">trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartylibwebrtcChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (213467 => 213468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/ChangeLog        2017-03-06 22:03:56 UTC (rev 213467)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog        2017-03-06 22:46:57 UTC (rev 213468)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-06 Alex Christensen <achristensen@webkit.org>
+
+ Fix Production libwebrtc build after r213418
+ https://bugs.webkit.org/show_bug.cgi?id=169217
+ <rdar://problem/30876775>
+
+ Reviewed by Tim Horton.
+
+ * Source/webrtc/base/checks.h:
+ * libwebrtc.xcodeproj/project.pbxproj:
+ MakeCheckOpString was a weak export, and it wasn't needed.
+ There is an internal build that checks for weak exports and fails if there is one.
+ Run the check-for-weak-vtables-and-externals script for libwebrtc.dylib like we do for the other frameworks.
+
</ins><span class="cx"> 2017-03-04 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] libwebrtc.dylib’s current version is fixed at 1.0.0
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcewebrtcbasechecksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/checks.h (213467 => 213468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/checks.h        2017-03-06 22:03:56 UTC (rev 213467)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/checks.h        2017-03-06 22:46:57 UTC (rev 213468)
</span><span class="lines">@@ -136,13 +136,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // MSVC doesn't like complex extern templates and DLLs.
</span><del>-#if !defined(COMPILER_MSVC)
</del><ins>+#if 0
</ins><span class="cx"> // Commonly used instantiations of MakeCheckOpString<>. Explicitly instantiated
</span><span class="cx"> // in logging.cc.
</span><span class="cx"> extern template std::string* MakeCheckOpString<int, int>(
</span><span class="cx"> const int&, const int&, const char* names);
</span><span class="cx"> extern template
</span><del>-WEBRTC_DYLIB_EXPORT std::string* MakeCheckOpString<unsigned long, unsigned long>(
</del><ins>+std::string* MakeCheckOpString<unsigned long, unsigned long>(
</ins><span class="cx"> const unsigned long&, const unsigned long&, const char* names);
</span><span class="cx"> extern template
</span><span class="cx"> std::string* MakeCheckOpString<unsigned long, unsigned int>(
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtclibwebrtcxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (213467 => 213468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj        2017-03-06 22:03:56 UTC (rev 213467)
+++ trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj        2017-03-06 22:46:57 UTC (rev 213468)
</span><span class="lines">@@ -10591,6 +10591,7 @@
</span><span class="cx">                                 FB39D77B1201110C00088E69 /* Headers */,
</span><span class="cx">                                 FB39D0CE1200F0E300088E69 /* Sources */,
</span><span class="cx">                                 FB39D0CF1200F0E300088E69 /* Frameworks */,
</span><ins>+                                5CD286461E6E154E0094FDC8 /* Check for Weak VTables and Externals */,
</ins><span class="cx">                                 312BDB0B15FECAB00097EBC7 /* CopyFiles */,
</span><span class="cx">                                 312BDB0D15FECACE0097EBC7 /* CopyFiles */,
</span><span class="cx">                         );
</span><span class="lines">@@ -10665,6 +10666,21 @@
</span><span class="cx">                         shellPath = /bin/sh;
</span><span class="cx">                         shellScript = "PRIVATE_HEADERS_FOLDER_PATH=usr/local/include\n\nif [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n PRIVATE_HEADERS_PATH=\"${DSTROOT}${INSTALL_PATH_PREFIX%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/Source/webrtc\" \"${PRIVATE_HEADERS_PATH}\"\n";
</span><span class="cx">                 };
</span><ins>+                5CD286461E6E154E0094FDC8 /* Check for Weak VTables and Externals */ = {
+                        isa = PBXShellScriptBuildPhase;
+                        buildActionMask = 2147483647;
+                        files = (
+                        );
+                        inputPaths = (
+                                "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
+                        );
+                        name = "Check for Weak VTables and Externals";
+                        outputPaths = (
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                        shellPath = /bin/sh;
+                        shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -f ../../../Tools/Scripts/check-for-weak-vtables-and-externals ]; then\n ../../../Tools/Scripts/check-for-weak-vtables-and-externals || exit $?\nfi";
+                };
</ins><span class="cx"> /* End PBXShellScriptBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXSourcesBuildPhase section */
</span></span></pre>
</div>
</div>
</body>
</html>