240063 2022-05-04 07:02:40 -0700 [Mac] WebCore should search system content path for nested Frameworks 2022-05-04 14:57:02 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 msaboff msaboff ap david_quesada emw webkit-bug-importer oldest_to_newest 1866434 0 msaboff 2022-05-04 07:02:40 -0700 We building with the system content path, we should search there for the WebCore nested frameworks instead of the symlinked location. 1866435 1 msaboff 2022-05-04 07:02:51 -0700 <rdar://92426000> 1866437 2 458791 msaboff 2022-05-04 07:20:58 -0700 Created attachment 458791 Patch 1866501 3 458791 emw 2022-05-04 09:56:52 -0700 Comment on attachment 458791 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. 1866513 4 458791 ap 2022-05-04 10:24:18 -0700 Comment on attachment 458791 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. 1866526 5 msaboff 2022-05-04 10:45:22 -0700 (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. 1866542 6 458814 msaboff 2022-05-04 11:17:24 -0700 Created attachment 458814 Patch for Landing 1866598 7 ews-feeder 2022-05-04 14:56:59 -0700 Committed r293794 (250268@main): <https://commits.webkit.org/250268@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458814. 458791 2022-05-04 07:20:58 -0700 2022-05-04 10:24:18 -0700 Patch 240063.patch text/plain 2000 msaboff SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI5Mzc3MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIyLTA1LTA0ICBNaWNoYWVs IFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIFdlYkNvcmUgc2hv dWxkIHNlYXJjaCBzeXN0ZW0gY29udGVudCBwYXRoIGZvciBuZXN0ZWQgRnJhbWV3b3JrcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQwMDYzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlZCBuZXN0 ZWQgZnJhbWV3b3JrcyBkaXJlY3RvcnkgdG8gYmUgYmVsb3cgd2hlcmUgV2ViQ29yZSB3aWxsIGJl IGluc3RhbGxlZAorICAgICAgICB3aGVuIGJ1aWxkaW5nIHdpdGggdGhlIHN5c3RlbSBjb250ZW50 IHBhdGguCisKKyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9XZWJDb3JlLnhjY29uZmlnOgorCiAy MDIyLTA1LTAzICBQaGlsaXBwZSBOb3JtYW5kICA8cGhpbG5AaWdhbGlhLmNvbT4KIAogICAgICAg ICBbR1N0cmVhbWVyXSBNZWRpYXN0cmVhbSBtb2NrIGF1ZGlvIGludGVycnVwdGlvbiBmaXhlcyBh ZnRlciByMjkwOTg1CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Db25maWd1cmF0aW9ucy9XZWJDb3Jl LnhjY29uZmlnCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NvbmZpZ3VyYXRpb25zL1dl YkNvcmUueGNjb25maWcJKHJldmlzaW9uIDI5Mzc3MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NvbmZp Z3VyYXRpb25zL1dlYkNvcmUueGNjb25maWcJKHdvcmtpbmcgY29weSkKQEAgLTYxLDcgKzYxLDcg QEAgU1lTVEVNX0ZSQU1FV09SS19TRUFSQ0hfUEFUSFMgPSAkKGluaGVyaXRlZCkgJChTREtST09U CiBXS19GUkFNRVdPUktTX0xJQlJBUllfRElSID0gJChXRUJDT1JFX0ZSQU1FV09SS1NfRElSKS9X ZWJDb3JlLmZyYW1ld29yay9GcmFtZXdvcmtzCiBXS19GUkFNRVdPUktTX0xJQlJBUllfRElSW3Nk az1tYWNvc3gqXSA9ICQoV0tfRlJBTUVXT1JLU19MSUJSQVJZX0RJUl9VU0VfQUxURVJOQVRFX0ZS QU1FV09SS1NfRElSXyQoV0tfVVNFX0FMVEVSTkFURV9GUkFNRVdPUktTX0RJUikpCiBXS19GUkFN RVdPUktTX0xJQlJBUllfRElSX1VTRV9BTFRFUk5BVEVfRlJBTUVXT1JLU19ESVJfTk8gPSAkKFdL X0ZSQU1FV09SS1NfTElCUkFSWV9ESVJfVVNFX09WRVJSSURFX0ZSQU1FV09SS1NfRElSXyQoV0tf VVNFX09WRVJSSURFX0ZSQU1FV09SS1NfRElSKSk7Ci1XS19GUkFNRVdPUktTX0xJQlJBUllfRElS X1VTRV9PVkVSUklERV9GUkFNRVdPUktTX0RJUl9OTyA9ICQoV0VCQ09SRV9GUkFNRVdPUktTX0RJ UikvV2ViQ29yZS5mcmFtZXdvcmsvVmVyc2lvbnMvQS9GcmFtZXdvcmtzOworV0tfRlJBTUVXT1JL U19MSUJSQVJZX0RJUl9VU0VfT1ZFUlJJREVfRlJBTUVXT1JLU19ESVJfTk8gPSAkKElOU1RBTExf UEFUSF9QUkVGSVgpJChXRUJDT1JFX0ZSQU1FV09SS1NfRElSKS9XZWJDb3JlLmZyYW1ld29yay9W ZXJzaW9ucy9BL0ZyYW1ld29ya3M7CiBXS19GUkFNRVdPUktTX0xJQlJBUllfRElSX1VTRV9PVkVS UklERV9GUkFNRVdPUktTX0RJUl9ZRVMgPSAkKFdLX09WRVJSSURFX0ZSQU1FV09SS1NfRElSKTsK IFdLX0ZSQU1FV09SS1NfTElCUkFSWV9ESVJfVVNFX0FMVEVSTkFURV9GUkFNRVdPUktTX0RJUl9Z RVMgPSAkKFdLX0FMVEVSTkFURV9GUkFNRVdPUktTX0RJUikvJChTWVNURU1fTElCUkFSWV9ESVIp L1ByaXZhdGVGcmFtZXdvcmtzL1dlYkNvcmUuZnJhbWV3b3JrL1ZlcnNpb25zL0EvRnJhbWV3b3Jr czsKIAo= 458814 2022-05-04 11:17:24 -0700 2022-05-04 14:57:00 -0700 Patch for Landing 240063-2.patch text/plain 2234 msaboff SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI5Mzc4MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIyLTA1LTA0ICBNaWNoYWVs IFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIFdlYkNvcmUgc2hv dWxkIHNlYXJjaCBzeXN0ZW0gY29udGVudCBwYXRoIGZvciBuZXN0ZWQgRnJhbWV3b3JrcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQwMDYzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KKworICAgICAgICBDaGFuZ2Vk IG5lc3RlZCBmcmFtZXdvcmtzIGRpcmVjdG9yeSB0byBiZSBiZWxvdyB3aGVyZSBXZWJDb3JlIHdp bGwgYmUgaW5zdGFsbGVkCisgICAgICAgIHdoZW4gYnVpbGRpbmcgd2l0aCB0aGUgc3lzdGVtIGNv bnRlbnQgcGF0aC4KKworICAgICAgICAqIENvbmZpZ3VyYXRpb25zL1dlYkNvcmUueGNjb25maWc6 CisKIDIwMjItMDUtMDQgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAg IFVzZSBJdGVyYXRpb25TdGF0dXMgaW4gbW9yZSBwbGFjZXMuCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9Db25maWd1cmF0aW9ucy9XZWJDb3JlLnhjY29uZmlnCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL0NvbmZpZ3VyYXRpb25zL1dlYkNvcmUueGNjb25maWcJKHJldmlzaW9uIDI5Mzc3MSkK KysrIFNvdXJjZS9XZWJDb3JlL0NvbmZpZ3VyYXRpb25zL1dlYkNvcmUueGNjb25maWcJKHdvcmtp bmcgY29weSkKQEAgLTYxLDkgKzYxLDkgQEAgU1lTVEVNX0ZSQU1FV09SS19TRUFSQ0hfUEFUSFMg PSAkKGluaGVyaXRlZCkgJChTREtST09UCiBXS19GUkFNRVdPUktTX0xJQlJBUllfRElSID0gJChX RUJDT1JFX0ZSQU1FV09SS1NfRElSKS9XZWJDb3JlLmZyYW1ld29yay9GcmFtZXdvcmtzCiBXS19G UkFNRVdPUktTX0xJQlJBUllfRElSW3Nkaz1tYWNvc3gqXSA9ICQoV0tfRlJBTUVXT1JLU19MSUJS QVJZX0RJUl9VU0VfQUxURVJOQVRFX0ZSQU1FV09SS1NfRElSXyQoV0tfVVNFX0FMVEVSTkFURV9G UkFNRVdPUktTX0RJUikpCiBXS19GUkFNRVdPUktTX0xJQlJBUllfRElSX1VTRV9BTFRFUk5BVEVf RlJBTUVXT1JLU19ESVJfTk8gPSAkKFdLX0ZSQU1FV09SS1NfTElCUkFSWV9ESVJfVVNFX09WRVJS SURFX0ZSQU1FV09SS1NfRElSXyQoV0tfVVNFX09WRVJSSURFX0ZSQU1FV09SS1NfRElSKSk7Ci1X S19GUkFNRVdPUktTX0xJQlJBUllfRElSX1VTRV9PVkVSUklERV9GUkFNRVdPUktTX0RJUl9OTyA9 ICQoV0VCQ09SRV9GUkFNRVdPUktTX0RJUikvV2ViQ29yZS5mcmFtZXdvcmsvVmVyc2lvbnMvQS9G cmFtZXdvcmtzOworV0tfRlJBTUVXT1JLU19MSUJSQVJZX0RJUl9VU0VfT1ZFUlJJREVfRlJBTUVX T1JLU19ESVJfTk8gPSAkKElOU1RBTExfUEFUSF9QUkVGSVgpJChXRUJDT1JFX0ZSQU1FV09SS1Nf RElSKS9XZWJDb3JlLmZyYW1ld29yay9WZXJzaW9ucy9BL0ZyYW1ld29ya3M7CiBXS19GUkFNRVdP UktTX0xJQlJBUllfRElSX1VTRV9PVkVSUklERV9GUkFNRVdPUktTX0RJUl9ZRVMgPSAkKFdLX09W RVJSSURFX0ZSQU1FV09SS1NfRElSKTsKLVdLX0ZSQU1FV09SS1NfTElCUkFSWV9ESVJfVVNFX0FM VEVSTkFURV9GUkFNRVdPUktTX0RJUl9ZRVMgPSAkKFdLX0FMVEVSTkFURV9GUkFNRVdPUktTX0RJ UikvJChTWVNURU1fTElCUkFSWV9ESVIpL1ByaXZhdGVGcmFtZXdvcmtzL1dlYkNvcmUuZnJhbWV3 b3JrL1ZlcnNpb25zL0EvRnJhbWV3b3JrczsKK1dLX0ZSQU1FV09SS1NfTElCUkFSWV9ESVJfVVNF X0FMVEVSTkFURV9GUkFNRVdPUktTX0RJUl9ZRVMgPSAkKElOU1RBTExfUEFUSF9QUkVGSVgpJChX S19BTFRFUk5BVEVfRlJBTUVXT1JLU19ESVIpLyQoU1lTVEVNX0xJQlJBUllfRElSKS9Qcml2YXRl RnJhbWV3b3Jrcy9XZWJDb3JlLmZyYW1ld29yay9WZXJzaW9ucy9BL0ZyYW1ld29ya3M7CiAKIExJ QlJBUllfU0VBUkNIX1BBVEhTID0gJChpbmhlcml0ZWQpICIkKFdLX0ZSQU1FV09SS1NfTElCUkFS WV9ESVIpIjsKIAo=