zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libpng package: fix build error on macOS arm64 (#37613)

Browse Source 
Turn off ARM NEON support on MacOS arm64

Co-authored-by: Stephen Herbener <stephen.herbener@gmail.com>
This commit is contained in:
Dom Heinzeller 2023-05-11 14:27:43 -06:00 committed by GitHub
parent 384f5f9960
commit 0e87243284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/libpng/package.py
View File

@ -41,9 +41,12 @@ class Libpng(CMakePackage):
class CMakeBuilder(CMakeBuilder): class CMakeBuilder(CMakeBuilder):
def cmake_args(self): def cmake_args(self):
return [ args = [
self.define("CMAKE_CXX_FLAGS", self.spec["zlib"].headers.include_flags), self.define("CMAKE_CXX_FLAGS", self.spec["zlib"].headers.include_flags),
self.define("ZLIB_ROOT", self.spec["zlib"].prefix), self.define("ZLIB_ROOT", self.spec["zlib"].prefix),
self.define("PNG_SHARED", "shared" in self.spec.variants["libs"].value), self.define("PNG_SHARED", "shared" in self.spec.variants["libs"].value),
self.define("PNG_STATIC", "static" in self.spec.variants["libs"].value), self.define("PNG_STATIC", "static" in self.spec.variants["libs"].value),
] ]
if self.spec.satisfies("platform=darwin target=aarch64:"):
args.append("-DPNG_ARM_NEON=off")
return args