Title: [253944] trunk/Source/ThirdParty/libwebrtc
- Revision
- 253944
- Author
- [email protected]
- Date
- 2019-12-30 06:45:41 -0800 (Mon, 30 Dec 2019)
Log Message
Do not build yasm for iOS and iOS simulator
https://bugs.webkit.org/show_bug.cgi?id=205556
<rdar://problem/58159497>
Reviewed by Eric Carlson.
We want to stop compiling yasm for iOS/iOS simulator but we do not have a good way to do so right now.
Instead, compile a dummy main_noop.c for iOS/iOS simulator and build the executable with it.
This executable wil anyway not be used on these platforms.
* Configurations/yasm.xcconfig:
* Source/third_party/yasm/main_noop.c: Added.
(main):
* libwebrtc.xcodeproj/project.pbxproj:
Modified Paths
Added Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (253943 => 253944)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2019-12-30 05:36:31 UTC (rev 253943)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2019-12-30 14:45:41 UTC (rev 253944)
@@ -1,3 +1,20 @@
+2019-12-30 youenn fablet <[email protected]>
+
+ Do not build yasm for iOS and iOS simulator
+ https://bugs.webkit.org/show_bug.cgi?id=205556
+ <rdar://problem/58159497>
+
+ Reviewed by Eric Carlson.
+
+ We want to stop compiling yasm for iOS/iOS simulator but we do not have a good way to do so right now.
+ Instead, compile a dummy main_noop.c for iOS/iOS simulator and build the executable with it.
+ This executable wil anyway not be used on these platforms.
+
+ * Configurations/yasm.xcconfig:
+ * Source/third_party/yasm/main_noop.c: Added.
+ (main):
+ * libwebrtc.xcodeproj/project.pbxproj:
+
2019-12-23 Commit Queue <[email protected]>
Unreviewed, rolling out r253884.
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig (253943 => 253944)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig 2019-12-30 05:36:31 UTC (rev 253943)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig 2019-12-30 14:45:41 UTC (rev 253944)
@@ -22,4 +22,4 @@
EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = $(ARM_FILES) sad.c
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = $(ARM_FILES) $(X86_FILES)
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(X86_FILES)
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(X86_FILES)
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig (253943 => 253944)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig 2019-12-30 05:36:31 UTC (rev 253943)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig 2019-12-30 14:45:41 UTC (rev 253944)
@@ -16,8 +16,9 @@
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = *_neon.c arm_cpudetect.c *_arm.c sad.c;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = *_neon.c arm_cpudetect.c *_arm.c sad.c;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = *_sse2.c *_ssse3.c *_sse4.c *_avx2.c *_avx.c *_sse2.asm.o *_sse3.asm.o;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = *;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = *;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = main_noop.c;
+INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = main_noop.c;
WK_ASAN_DISALLOWED = YES;
Added: trunk/Source/ThirdParty/libwebrtc/Source/third_party/yasm/main_noop.c (0 => 253944)
--- trunk/Source/ThirdParty/libwebrtc/Source/third_party/yasm/main_noop.c (rev 0)
+++ trunk/Source/ThirdParty/libwebrtc/Source/third_party/yasm/main_noop.c 2019-12-30 14:45:41 UTC (rev 253944)
@@ -0,0 +1,4 @@
+int main()
+{
+ return 0;
+}
Modified: trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (253943 => 253944)
--- trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2019-12-30 05:36:31 UTC (rev 253943)
+++ trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2019-12-30 14:45:41 UTC (rev 253944)
@@ -1267,6 +1267,7 @@
417953F8216984BE0028266B /* RTCCodecSpecificInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 417953F4216984BD0028266B /* RTCCodecSpecificInfo.h */; };
417953F9216984BE0028266B /* RTCI420Buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 417953F5216984BD0028266B /* RTCI420Buffer.h */; };
417953FA216984BE0028266B /* RTCEncodedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 417953F6216984BD0028266B /* RTCEncodedImage.m */; };
+ 417C037323B210C400DE5D8B /* main_noop.c in Sources */ = {isa = PBXBuildFile; fileRef = 417C037223B210C400DE5D8B /* main_noop.c */; };
41889D75216BB7B9004614DD /* RTCRtpEncodingParameters+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 41889D74216BB7B6004614DD /* RTCRtpEncodingParameters+Private.h */; };
41889D76216BC4EC004614DD /* RTCRtpEncodingParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 414FB869216BB767001F5492 /* RTCRtpEncodingParameters.h */; };
41889D77216BC4EC004614DD /* RTCRtpEncodingParameters.mm in Sources */ = {isa = PBXBuildFile; fileRef = 414FB86A216BB768001F5492 /* RTCRtpEncodingParameters.mm */; };
@@ -3544,7 +3545,7 @@
outputFiles = (
"${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o",
);
- script = "# This DYLD_ROOT_PATH hack is there to allow the yasm binary to run on macOS if it was built for another platform (e.g. iphonesimulator) - rdar://52020841 and rdar://50479465\nDYLD_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";
+ 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";
};
/* End PBXBuildRule section */
@@ -5168,6 +5169,7 @@
41795402216985200028266B /* RTCVideoDecoderVP8.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RTCVideoDecoderVP8.mm; sourceTree = "<group>"; };
41795403216985200028266B /* RTCWrappedNativeVideoDecoder.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RTCWrappedNativeVideoDecoder.mm; sourceTree = "<group>"; };
41795404216985200028266B /* RTCWrappedNativeVideoEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCWrappedNativeVideoEncoder.h; sourceTree = "<group>"; };
+ 417C037223B210C400DE5D8B /* main_noop.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main_noop.c; sourceTree = "<group>"; };
41889D74216BB7B6004614DD /* RTCRtpEncodingParameters+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RTCRtpEncodingParameters+Private.h"; sourceTree = "<group>"; };
4191009C2152E18D00A6F17B /* vpx_config.asm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm.asm; path = vpx_config.asm; sourceTree = "<group>"; };
4191009D2152E18D00A6F17B /* vpx_config.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vpx_config.c; sourceTree = "<group>"; };
@@ -10427,6 +10429,7 @@
41FE8667215C53CE00B62C07 /* gas-token.c */,
41BE71DF215C470B00A7B196 /* libyasm-stdint.h */,
41BE71E0215C470B00A7B196 /* license.c */,
+ 417C037223B210C400DE5D8B /* main_noop.c */,
419EA1F8215C4A9E0082BFD2 /* module.c */,
41FE865C215C538900B62C07 /* nasm-token.c */,
41FE866C215C542100B62C07 /* x86cpu.c */,
@@ -16237,6 +16240,7 @@
41BE71CA215C464800A7B196 /* hamt.c in Sources */,
41BE71CB215C464800A7B196 /* insn.c in Sources */,
41BE717B215C459000A7B196 /* intnum.c in Sources */,
+ 417C037323B210C400DE5D8B /* main_noop.c in Sources */,
41BE717C215C459000A7B196 /* inttree.c in Sources */,
41BE71CC215C464800A7B196 /* linemap.c in Sources */,
419EA1F3215C48C70082BFD2 /* macho-objfmt.c in Sources */,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
