Attachment 373154 Details for Bug 199337 – Patch

[patch] Patch

bug-199337-20190629082026.patch (text/plain), 2.16 KB, created by Dean Jackson on 2019-06-28 15:20:28 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Jackson

Created: 2019-06-28 15:20:28 PDT

Size: 2.16 KB

patch

obsolete

>Subversion Revision: 246908
>diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
>index b15a82d923bc47da72fb7806cb1864ddd55a3058..b532a3f4f8874067113b2dac2306e1357dd86939 100644
>--- a/Source/ThirdParty/libwebrtc/ChangeLog
>+++ b/Source/ThirdParty/libwebrtc/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-06-28  Dean Jackson  <dino@apple.com>
>+
>+        unable to build WebRTC for iOS Simulator
>+        https://bugs.webkit.org/show_bug.cgi?id=199337
>+        <rdar://problem/52020841>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Run the compiled yasm with DYLD_ROOT_PATH=/
>+        in order to convince dyld that it can load
>+        the simulator binary on macOS.
>+
>+        * libwebrtc.xcodeproj/project.pbxproj:
>+
> 2019-06-27  Beth Dakin  <bdakin@apple.com>
> 
>         Upstream use of MACCATALYST
>diff --git a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
>index bbcf63d51f735e17aa40d2b528a989ec4a306abf..5d7715124e36e9aaaa797a5c62c7070212299589 100644
>--- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
>+++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
>@@ -3375,11 +3375,13 @@
> 			compilerSpec = com.apple.compilers.proxy.script;
> 			filePatterns = asm;
> 			fileType = sourcecode.asm.asm;
>+			inputFiles = (
>+			);
> 			isEditable = 1;
> 			outputFiles = (
> 				"${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o",
> 			);
>-			script = "${BUILT_PRODUCTS_DIR}/yasm -fmacho64 -I ${SRCROOT}/Source/third_party/libvpx/source/config -I ${SRCROOT}/Source/third_party/libvpx/source/config/mac/x64 -I ${SRCROOT}/Source/third_party/libvpx/source/libvpx -o ${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o ${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.asm\n";
>+			script = "DYLD_ROOT_PATH=/ ${BUILT_PRODUCTS_DIR}/yasm -fmacho64 -I ${SRCROOT}/Source/third_party/libvpx/source/config -I ${SRCROOT}/Source/third_party/libvpx/source/config/mac/x64 -I ${SRCROOT}/Source/third_party/libvpx/source/libvpx -o ${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o ${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.asm\n";
> 		};
> /* End PBXBuildRule section */
>

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 199337: 373147 | 373154