Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use non-versioned DYLD_FRAMEWORK/LIBRARY_PATH when building StagedFrameworks for Ventura and later. #8866

Merged
merged 1 commit into from Jan 23, 2023
Merged

Use non-versioned DYLD_FRAMEWORK/LIBRARY_PATH when building StagedFrameworks for Ventura and later. #8866

merged 1 commit into from Jan 23, 2023

Conversation

davidquesada
Copy link
Contributor

@davidquesada davidquesada commented Jan 20, 2023 •
edited by webkit-early-warning-system

4076d91

Use non-versioned DYLD_FRAMEWORK/LIBRARY_PATH when building StagedFrameworks for Ventura and later.
https://bugs.webkit.org/show_bug.cgi?id=250886
rdar://104435890

Reviewed by Elliott Williams.

When building into the StagedFramework install path for macOS Ventura or later, use the DYLD_LIBRARY_PATH
and DYLD_FRAMEWORK_PATH environment variables (and not the DYLD_VERSIONED* variants) to make the executables
load frameworks from the StagedFrameworks path. While here, rename OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH to
OTHER_LDFLAGS_STAGED_FRAMEWORK_PATH to avoid a perceived connection to the to-be-phased-out-over-time
DYLD_VERSIONED_*_PATH environment variables.

* Source/WebKit/Configurations/BaseTarget.xcconfig:
* Source/WebKit/Configurations/BaseXPCService.xcconfig:
* Source/WebKit/Configurations/DebugRelease.xcconfig:
* Source/WebKit/Configurations/GPUService.xcconfig:
* Source/WebKit/Configurations/NetworkService.xcconfig:
* Source/WebKit/Configurations/WebContentService.xcconfig:

Canonical link: https://commits.webkit.org/259217@main

8430015

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge ✅ 🛠 watch-sim

@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 8430015)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge ✅ 🛠 watch-sim

@davidquesada davidquesada added the merge-queue Applied to send a pull request to merge-queue label Jan 23, 2023
@davidquesada
Use non-versioned DYLD_FRAMEWORK/LIBRARY_PATH when building StagedFra…
4076d91 
…meworks for Ventura and later.

https://bugs.webkit.org/show_bug.cgi?id=250886
rdar://104435890

Reviewed by Elliott Williams.

When building into the StagedFramework install path for macOS Ventura or later, use the DYLD_LIBRARY_PATH
and DYLD_FRAMEWORK_PATH environment variables (and not the DYLD_VERSIONED* variants) to make the executables
load frameworks from the StagedFrameworks path. While here, rename OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH to
OTHER_LDFLAGS_STAGED_FRAMEWORK_PATH to avoid a perceived connection to the to-be-phased-out-over-time
DYLD_VERSIONED_*_PATH environment variables.

* Source/WebKit/Configurations/BaseTarget.xcconfig:
* Source/WebKit/Configurations/BaseXPCService.xcconfig:
* Source/WebKit/Configurations/DebugRelease.xcconfig:
* Source/WebKit/Configurations/GPUService.xcconfig:
* Source/WebKit/Configurations/NetworkService.xcconfig:
* Source/WebKit/Configurations/WebContentService.xcconfig:

Canonical link: https://commits.webkit.org/259217@main
@webkit-commit-queue webkit-commit-queue changed the title Use non-versioned DYLD_FRAMEWORK/LIBRARY_PATH when building StagedFra… Use non-versioned DYLD_FRAMEWORK/LIBRARY_PATH when building StagedFrameworks for Ventura and later. Jan 23, 2023
@webkit-commit-queue webkit-commit-queue merged commit 4076d91 into WebKit:main Jan 23, 2023
@webkit-commit-queue
Copy link
Collaborator

Committed 259217@main (4076d91): https://commits.webkit.org/259217@main

Reviewed commits have been landed. Closing PR #8866 and removing active labels.

@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jan 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emw-apple emw-apple emw-apple approved these changes

@aproskuryakov aproskuryakov Awaiting requested review from aproskuryakov

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@davidquesada @webkit-early-warning-system @webkit-commit-queue @emw-apple