Changeset 253944 in webkit


Ignore:
Timestamp:
Dec 30, 2019 6:45:41 AM (4 years ago)
Author:
youenn@apple.com
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:
Location:
trunk/Source/ThirdParty/libwebrtc
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r253888 r253944  
     12019-12-30  youenn fablet  <youenn@apple.com>
     2
     3        Do not build yasm for iOS and iOS simulator
     4        https://bugs.webkit.org/show_bug.cgi?id=205556
     5        <rdar://problem/58159497>
     6
     7        Reviewed by Eric Carlson.
     8
     9        We want to stop compiling yasm for iOS/iOS simulator but we do not have a good way to do so right now.
     10        Instead, compile a dummy main_noop.c for iOS/iOS simulator and build the executable with it.
     11        This executable wil anyway not be used on these platforms.
     12
     13        * Configurations/yasm.xcconfig:
     14        * Source/third_party/yasm/main_noop.c: Added.
     15        (main):
     16        * libwebrtc.xcodeproj/project.pbxproj:
     17
    1182019-12-23  Commit Queue  <commit-queue@webkit.org>
    219

  • trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig

    r253872 r253944  
    2323EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = $(ARM_FILES) sad.c
    2424EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = $(ARM_FILES) $(X86_FILES)
    25 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(X86_FILES)
     25EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(X86_FILES)

  • trunk/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig

    r253888 r253944  
    1717CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
    1818
    19 EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = *_neon.c arm_cpudetect.c *_arm.c sad.c;
    20 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = *_neon.c arm_cpudetect.c *_arm.c sad.c;
    21 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = *_sse2.c *_ssse3.c *_sse4.c *_avx2.c *_avx.c *_sse2.asm.o *_sse3.asm.o;
     19EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = *;
     20EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = *;
     21EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = main_noop.c;
     22INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = main_noop.c;
    2223
    2324WK_ASAN_DISALLOWED = YES;

  • trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj

    r253888 r253944  
    12681268                417953F9216984BE0028266B /* RTCI420Buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 417953F5216984BD0028266B /* RTCI420Buffer.h */; };
    12691269                417953FA216984BE0028266B /* RTCEncodedImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 417953F6216984BD0028266B /* RTCEncodedImage.m */; };
     1270                417C037323B210C400DE5D8B /* main_noop.c in Sources */ = {isa = PBXBuildFile; fileRef = 417C037223B210C400DE5D8B /* main_noop.c */; };
    12701271                41889D75216BB7B9004614DD /* RTCRtpEncodingParameters+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 41889D74216BB7B6004614DD /* RTCRtpEncodingParameters+Private.h */; };
    12711272                41889D76216BC4EC004614DD /* RTCRtpEncodingParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 414FB869216BB767001F5492 /* RTCRtpEncodingParameters.h */; };
    … …  
    35453546                                "${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o",
    35463547                        );
    3547                         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";
     3548                        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";
    35483549                };
    35493550/* End PBXBuildRule section */
    … …  
    51695170                41795403216985200028266B /* RTCWrappedNativeVideoDecoder.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RTCWrappedNativeVideoDecoder.mm; sourceTree = "<group>"; };
    51705171                41795404216985200028266B /* RTCWrappedNativeVideoEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCWrappedNativeVideoEncoder.h; sourceTree = "<group>"; };
     5172                417C037223B210C400DE5D8B /* main_noop.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main_noop.c; sourceTree = "<group>"; };
    51715173                41889D74216BB7B6004614DD /* RTCRtpEncodingParameters+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RTCRtpEncodingParameters+Private.h"; sourceTree = "<group>"; };
    51725174                4191009C2152E18D00A6F17B /* vpx_config.asm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm.asm; path = vpx_config.asm; sourceTree = "<group>"; };
    … …  
    1042810430                                41BE71DF215C470B00A7B196 /* libyasm-stdint.h */,
    1042910431                                41BE71E0215C470B00A7B196 /* license.c */,
     10432                                417C037223B210C400DE5D8B /* main_noop.c */,
    1043010433                                419EA1F8215C4A9E0082BFD2 /* module.c */,
    1043110434                                41FE865C215C538900B62C07 /* nasm-token.c */,
    … …  
    1623816241                                41BE71CB215C464800A7B196 /* insn.c in Sources */,
    1623916242                                41BE717B215C459000A7B196 /* intnum.c in Sources */,
     16243                                417C037323B210C400DE5D8B /* main_noop.c in Sources */,
    1624016244                                41BE717C215C459000A7B196 /* inttree.c in Sources */,
    1624116245                                41BE71CC215C464800A7B196 /* linemap.c in Sources */,
Note: See TracChangeset for help on using the changeset viewer.