Bug 240063

Summary:

[Mac] WebCore should search system content path for nested Frameworks

Product:

WebKit

Reporter:

Michael Saboff <msaboff>

Component:

Platform

Assignee:

Michael Saboff <msaboff>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

ap, david_quesada, emw, webkit-bug-importer

Priority:

Keywords:

InRadar

Version:

WebKit Nightly Build

Hardware:

Unspecified

OS:

Unspecified

Attachments:

Description	Flags
Patch	ap: review+, ap: commit-queue-
Patch for Landing	none

Description Michael Saboff 2022-05-04 07:02:40 PDT

We building with the system content path, we should search there for the WebCore nested frameworks instead of the symlinked location.

Comment 1 Michael Saboff 2022-05-04 07:02:51 PDT

<rdar://92426000>

Comment 2 Michael Saboff 2022-05-04 07:20:58 PDT

Created attachment 458791 [details]
Patch

Comment 3 Elliott Williams 2022-05-04 09:56:52 PDT

Comment on attachment 458791 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=458791&action=review

r=me

> Source/WebCore/Configurations/WebCore.xcconfig:66
>  WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;

Do we want $(INSTALL_PATH_PREFIX) here too? I believe this path is used for catalyst builds, where WK_ALTERNATE_FRAMEWORKS_DIR = /System/iOSSupport.

Comment 4 Alexey Proskuryakov 2022-05-04 10:24:18 PDT

Comment on attachment 458791 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=458791&action=review

>> Source/WebCore/Configurations/WebCore.xcconfig:66
>>  WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
> 
> Do we want $(INSTALL_PATH_PREFIX) here too? I believe this path is used for catalyst builds, where WK_ALTERNATE_FRAMEWORKS_DIR = /System/iOSSupport.

Great catch, I think that we need the same change for macCatalyst too. Surprised that building with the patch didn't fail macCatalyst build.

Comment 5 Michael Saboff 2022-05-04 10:45:22 PDT

(In reply to Alexey Proskuryakov from comment #4)
> Comment on attachment 458791 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=458791&action=review
> 
> >> Source/WebCore/Configurations/WebCore.xcconfig:66
> >>  WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
> > 
> > Do we want $(INSTALL_PATH_PREFIX) here too? I believe this path is used for catalyst builds, where WK_ALTERNATE_FRAMEWORKS_DIR = /System/iOSSupport.
> 
> Great catch, I think that we need the same change for macCatalyst too.
> Surprised that building with the patch didn't fail macCatalyst build.

Added.  Running a local macCatalyst build to verify.

Comment 6 Michael Saboff 2022-05-04 11:17:24 PDT

Created attachment 458814 [details]
Patch for Landing

Comment 7 EWS 2022-05-04 14:56:59 PDT

Committed r293794 (250268@main): <https://commits.webkit.org/250268@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 458814 [details].