Title: [213468] trunk/Source/ThirdParty/libwebrtc
- Revision
- 213468
- Author
- [email protected]
- Date
- 2017-03-06 14:46:57 -0800 (Mon, 06 Mar 2017)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (213467 => 213468)
--- 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)
@@ -1,3 +1,17 @@
+2017-03-06 Alex Christensen <[email protected]>
+
+ 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.
+
2017-03-04 Dan Bernstein <[email protected]>
[Cocoa] libwebrtc.dylib’s current version is fixed at 1.0.0
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/checks.h (213467 => 213468)
--- 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)
@@ -136,13 +136,13 @@
}
// MSVC doesn't like complex extern templates and DLLs.
-#if !defined(COMPILER_MSVC)
+#if 0
// Commonly used instantiations of MakeCheckOpString<>. Explicitly instantiated
// in logging.cc.
extern template std::string* MakeCheckOpString<int, int>(
const int&, const int&, const char* names);
extern template
-WEBRTC_DYLIB_EXPORT std::string* MakeCheckOpString<unsigned long, unsigned long>(
+std::string* MakeCheckOpString<unsigned long, unsigned long>(
const unsigned long&, const unsigned long&, const char* names);
extern template
std::string* MakeCheckOpString<unsigned long, unsigned int>(
Modified: trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (213467 => 213468)
--- 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)
@@ -10591,6 +10591,7 @@
FB39D77B1201110C00088E69 /* Headers */,
FB39D0CE1200F0E300088E69 /* Sources */,
FB39D0CF1200F0E300088E69 /* Frameworks */,
+ 5CD286461E6E154E0094FDC8 /* Check for Weak VTables and Externals */,
312BDB0B15FECAB00097EBC7 /* CopyFiles */,
312BDB0D15FECACE0097EBC7 /* CopyFiles */,
);
@@ -10665,6 +10666,21 @@
shellPath = /bin/sh;
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";
};
+ 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";
+ };
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
