Added -DPNG_ARM_NEON=off to cmake arguments for the darwin arm64 case. #265
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
climbfuji
requested changes
May 10, 2023
| self.define("CMAKE_CXX_FLAGS", self.spec["zlib"].headers.include_flags), | ||
| self.define("ZLIB_ROOT", self.spec["zlib"].prefix), | ||
| self.define("PNG_SHARED", "shared" in self.spec.variants["libs"].value), | ||
| self.define("PNG_STATIC", "static" in self.spec.variants["libs"].value), | ||
| ] | ||
| ] | ||
| if platform.system() == "Darwin" and platform.machine() == "arm64": |
There was a problem hiding this comment.
Can you try
Suggested change
| if platform.system() == "Darwin" and platform.machine() == "arm64": | |
| if self.spec.satisfies("platform=darwin target=aarch64:"): |
and then revert the import platform changes in lines 6-7 please?
There was a problem hiding this comment.
Your suggestion worked. Thanks! I think it's an improvement since it doesn't rely on the python platform module.
…ure with a builtin spack method.
climbfuji
approved these changes
May 11, 2023
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.
The PNG_ARM_NEON feature on the Mac arm64 architecture does not compile successfully so this PR shuts that feature off but only when on the Mac arm64 architecture. Note that the PNG_ARM_NEON feature is not relevant to the Mac x86_64 (intel) architecture.
This fixes an issue (JCSDA/spack-stack/issues/572) that surfaced when the NOAA-EMC/spack repo was recently sync'd up with the authoritative spack repo. This is because the libpng package.py script was changed from using Autotools to CMake, and the Autotools configuration had PNG_ARM_NEON off by default whereas the CMake configuration has PNG_ARM_NEON on by default.
Fixes JCSDA/spack-stack/issues/572