WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-238692-20220401185701.patch (text/plain), 5.55 KB, created by
Tim Horton
on 2022-04-01 18:57:02 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Tim Horton
Created:
2022-04-01 18:57:02 PDT
Size:
5.55 KB
patch
obsolete
>Subversion Revision: 292249 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index be3f18f31f9d178997323e88d338ee14827967fa..3469baa4b58bc7b0038be5f2220aea33cd3fbe1e 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,12 @@ >+2022-04-01 Tim Horton <timothy_horton@apple.com> >+ >+ Fix the WebGPU-less build >+ https://bugs.webkit.org/show_bug.cgi?id=238692 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Configurations/WebCore.xcconfig: >+ > 2022-04-01 Simon Fraser <simon.fraser@apple.com> > > Hoist the IOSurfacePool out of IOSurface >diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig >index 8ad903b4a7338c757a5b6e815831d6bd61bedc19..8a5ceb034d9a8954626dbc0d247d3a329620bbc0 100644 >--- a/Source/WebCore/Configurations/WebCore.xcconfig >+++ b/Source/WebCore/Configurations/WebCore.xcconfig >@@ -102,7 +102,15 @@ OUTPUT_ALTERNATE_ROOT_PATH_YES_YES[sdk=macosx*] = $(DSTROOT)$(ALTERNATE_ROOT_PAT > > WK_ANGLE_LDFLAGS = -weak-lANGLE-shared; > >-WK_WEBGPU_LDFLAGS = -weak_framework WebGPU; >+WK_WEBGPU_LDFLAGS = $(WK_WEBGPU_LDFLAGS_$(PLATFORM_NAME)); >+WK_WEBGPU_LDFLAGS_iphoneos = -weak_framework WebGPU; >+WK_WEBGPU_LDFLAGS_iphonesimulator = -weak_framework WebGPU; >+WK_WEBGPU_LDFLAGS_watchos = -weak_framework WebGPU; >+WK_WEBGPU_LDFLAGS_watchsimulator = -weak_framework WebGPU; >+WK_WEBGPU_LDFLAGS_appletvos = -weak_framework WebGPU; >+WK_WEBGPU_LDFLAGS_appletvsimulator = -weak_framework WebGPU; >+WK_WEBGPU_LDFLAGS_maccatalyst = -weak_framework WebGPU; >+WK_WEBGPU_LDFLAGS_macosx = -weak_framework WebGPU; > > WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME)); > WK_APPKIT_LDFLAGS_macosx = -framework AppKit; >@@ -141,13 +149,13 @@ WK_MOBILE_CORE_SERVICES_LDFLAGS_cocoatouch = -framework MobileCoreServices; > WK_MOBILE_GESTALT_LDFLAGS = $(WK_MOBILE_GESTALT_LDFLAGS_$(WK_COCOA_TOUCH)); > WK_MOBILE_GESTALT_LDFLAGS_cocoatouch = -lMobileGestalt; > >-WK_NETWORK_EXTENSION_LD_FLAGS = $(WK_NETWORK_EXTENSION_LD_FLAGS_$(WK_PLATFORM_NAME)); >-WK_NETWORK_EXTENSION_LD_FLAGS_iphoneos = -framework NetworkExtension; >-WK_NETWORK_EXTENSION_LD_FLAGS_iphonesimulator = -framework NetworkExtension; >-WK_NETWORK_EXTENSION_LD_FLAGS_watchos = -framework NetworkExtension; >-WK_NETWORK_EXTENSION_LD_FLAGS_watchsimulator = -framework NetworkExtension; >-WK_NETWORK_EXTENSION_LD_FLAGS_maccatalyst = -framework NetworkExtension; >-WK_NETWORK_EXTENSION_LD_FLAGS_macosx = -weak_framework NetworkExtension; >+WK_NETWORK_EXTENSION_LDFLAGS = $(WK_NETWORK_EXTENSION_LDFLAGS_$(WK_PLATFORM_NAME)); >+WK_NETWORK_EXTENSION_LDFLAGS_iphoneos = -framework NetworkExtension; >+WK_NETWORK_EXTENSION_LDFLAGS_iphonesimulator = -framework NetworkExtension; >+WK_NETWORK_EXTENSION_LDFLAGS_watchos = -framework NetworkExtension; >+WK_NETWORK_EXTENSION_LDFLAGS_watchsimulator = -framework NetworkExtension; >+WK_NETWORK_EXTENSION_LDFLAGS_maccatalyst = -framework NetworkExtension; >+WK_NETWORK_EXTENSION_LDFLAGS_macosx = -weak_framework NetworkExtension; > > WK_SYSTEM_CONFIGURATION_LDFLAGS = $(WK_SYSTEM_CONFIGURATION_LDFLAGS_$(WK_PLATFORM_NAME)); > WK_SYSTEM_CONFIGURATION_LDFLAGS_macosx = -framework SystemConfiguration; >@@ -161,7 +169,7 @@ WK_SCENEKIT_LDFLAGS = $(WK_SCENEKIT_LDFLAGS_$(WK_PLATFORM_NAME)); > WK_SCENEKIT_LDFLAGS_macosx = -weak_framework SceneKit; > > // FIXME: Reduce the number of allowable_clients <rdar://problem/31823969> >-OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_ANGLE_LDFLAGS) $(WK_WEBGPU_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_NETWORK_EXTENSION_LD_FLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_SCENEKIT_LDFLAGS) $(SOURCE_VERSION_LDFLAGS); >+OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_ANGLE_LDFLAGS) $(WK_WEBGPU_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_NETWORK_EXTENSION_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_SCENEKIT_LDFLAGS) $(SOURCE_VERSION_LDFLAGS); > > OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI; > OTHER_LDFLAGS_PLATFORM_macosx = -sub_library libobjc -umbrella WebKit;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 238692
:
456425
|
456426