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

hdf4: fix build on Apple M1 (#33740)

Browse Source
This commit is contained in:
Dom Heinzeller 2022-11-14 09:49:34 -07:00 committed by GitHub
parent 57f4c922e9
commit 2913f8b42b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/hdf/hdfi_h_apple_m1.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/hdf/src/hdfi.h 2022-11-07 11:51:28.000000000 -0700
+++ b/hdf/src/hdfi.h 2022-11-07 11:51:08.000000000 -0700
@@ -1343,7 +1343,7 @@
#endif /* IA64 */
/* Linux AArch64 */
-#if defined __aarch64__
+#if defined __aarch64__ && ! defined (__APPLE__)
#ifdef GOT_MACHINE
If you get an error on this line more than one machine type has been defined.

2
var/spack/repos/builtin/packages/hdf/package.py
View File

@ -93,6 +93,8 @@ class Hdf(AutotoolsPackage):
sha256="49733dd6143be7b30a28d386701df64a72507974274f7e4c0a9e74205510ea72", sha256="49733dd6143be7b30a28d386701df64a72507974274f7e4c0a9e74205510ea72",
when="@4.2.15:", when="@4.2.15:",
) )
# https://github.com/NOAA-EMC/spack-stack/issues/317
patch("hdfi_h_apple_m1.patch", when="@4.2.15: target=aarch64: platform=darwin")
@property @property
def libs(self): def libs(self):