APPLE: Remove multiple instances of ZLIB #3551
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Due to a prior change in OpenUSD, ZLIB was moved to a conditional dependency, and then removed from the list if run on Linux or macOS Unfortunately, the removal only removes the first found instance of ZLib, so doesn't remove it if multiple dependencies ask for it. A future clang version also has issues with the ZLib version used here so this would be needed to pass builds soon. However, since clang is used primarily on Linux and Mac, it is preferred to just use the OS provided version of Zlib.
nvmkuruc
reviewed
Feb 27, 2025
| @@ -2514,7 +2514,7 @@ def ForceBuildDependency(self, dep): | |||
| # itself does not require it. The --no-zlib flag can be passed to the build | |||
| # script to allow the dependency to find zlib in the build environment. | |||
| if (Linux() or not context.buildZlib) and ZLIB in requiredDependencies: | |||
| requiredDependencies.remove(ZLIB) | |||
There was a problem hiding this comment.
Do you think requiredDependencies could be a set to avoid this issue?
There was a problem hiding this comment.
I believe we rely on requiredDependencies being ordered to ensure we build dependencies before their dependents.
There was a problem hiding this comment.
Unfortunately, not. It needs to preserve ordering and afaik that's still not guaranteed for a set in Python.
Edit: replied at the same time as Sunya
|
Filed as internal issue #USD-10713 (This is an automated message. See here for more information.) |
|
/AzurePipelines run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change(s)
Due to a prior change in OpenUSD, ZLIB was moved to a conditional dependency, and then removed from the list if run on Linux or macOS
Unfortunately, the removal only removes the first found instance of ZLib, so doesn't remove it if multiple dependencies ask for it.
A future clang version also has issues with the ZLib version used here so this would be needed to pass builds soon. However, since clang is used primarily on Linux and Mac, it is preferred to just use the OS provided version of Zlib.
Checklist
I have created this PR based on the dev branch
I have followed the coding conventions
I have added unit tests that exercise this functionality (Reference:
testing guidelines)
I have verified that all unit tests pass with the proposed changes
I have submitted a signed Contributor License Agreement (Reference:
Contributor License Agreement instructions)