diff options
| author | Dom Heinzeller <dom.heinzeller@icloud.com> | 2022-11-14 09:49:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-14 17:49:34 +0100 |
| commit | 2913f8b42b27868c0ec021e6fb319ec5b26ab605 (patch) | |
| tree | 718eb366d393a742c9df2e6c8d83ac0295dc1d7d /var | |
| parent | 57f4c922e9c433f0ef97b69a96e1321ed267d3b8 (diff) | |
| download | spack-2913f8b42b27868c0ec021e6fb319ec5b26ab605.tar.gz spack-2913f8b42b27868c0ec021e6fb319ec5b26ab605.tar.bz2 spack-2913f8b42b27868c0ec021e6fb319ec5b26ab605.tar.xz spack-2913f8b42b27868c0ec021e6fb319ec5b26ab605.zip | |
hdf4: fix build on Apple M1 (#33740)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/hdf/hdfi_h_apple_m1.patch | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hdf/package.py | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/hdf/hdfi_h_apple_m1.patch b/var/spack/repos/builtin/packages/hdf/hdfi_h_apple_m1.patch new file mode 100644 index 0000000000..9499fc2de1 --- /dev/null +++ b/var/spack/repos/builtin/packages/hdf/hdfi_h_apple_m1.patch @@ -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. diff --git a/var/spack/repos/builtin/packages/hdf/package.py b/var/spack/repos/builtin/packages/hdf/package.py index 326f454048..96e15d3a65 100644 --- a/var/spack/repos/builtin/packages/hdf/package.py +++ b/var/spack/repos/builtin/packages/hdf/package.py @@ -93,6 +93,8 @@ class Hdf(AutotoolsPackage): sha256="49733dd6143be7b30a28d386701df64a72507974274f7e4c0a9e74205510ea72", 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 def libs(self): |