Bug 240063 - [Mac] WebCore should search system content path for nested Frameworks
Summary: [Mac] WebCore should search system content path for nested Frameworks
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Platform (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Michael Saboff
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2022-05-04 07:02 PDT by Michael Saboff
Modified: 2022-05-04 14:57 PDT (History)
4 users (show)

See Also:


Attachments
Patch (1.95 KB, patch)
2022-05-04 07:20 PDT, Michael Saboff
ap: review+
ap: commit-queue-
Details | Formatted Diff | Diff
Patch for Landing (2.18 KB, patch)
2022-05-04 11:17 PDT, Michael Saboff
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
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].