diff options
author | Chris Marsh <chrismarsh.c2@gmail.com> | 2024-07-30 11:38:07 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-30 11:38:07 -0600 |
commit | 65a15c61458a9700940ff25210cfe2192856e4ac (patch) | |
tree | ffaf9c8ef40a9f25a769a347d9151cfdd4aa0012 /var | |
parent | e563f84ae298fab6f137d59b7e50dbeac1df8d45 (diff) | |
download | spack-65a15c61458a9700940ff25210cfe2192856e4ac.tar.gz spack-65a15c61458a9700940ff25210cfe2192856e4ac.tar.bz2 spack-65a15c61458a9700940ff25210cfe2192856e4ac.tar.xz spack-65a15c61458a9700940ff25210cfe2192856e4ac.zip |
Mac OS UUID virtual: platform-specific virtuals not correctly prioritized (#43002)
`apple-libuuid` includes types that aren't available in other `uuid`
providers; this cause issues in consuming packages (e.g., py-matplotlib)
that use SDKs like CarbonCore.framework when they attempt to use
`util-linux-uuid` as a `uuid` provider on Mac OS.
Tweak `util-linux-uuid` to indicate that it does not provide `uuid`
on Mac OS.
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/libuuid/package.py | 5 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/ossp-uuid/package.py | 5 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/util-linux-uuid/package.py | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/libuuid/package.py b/var/spack/repos/builtin/packages/libuuid/package.py index 0cc3f48ff6..1a0a2ebfcd 100644 --- a/var/spack/repos/builtin/packages/libuuid/package.py +++ b/var/spack/repos/builtin/packages/libuuid/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import sys + from spack.package import * @@ -20,6 +22,7 @@ class Libuuid(AutotoolsPackage, SourceforgePackage): depends_on("c", type="build") # generated - provides("uuid") + if sys.platform not in ["darwin", "win32"]: + provides("uuid") conflicts("%gcc@14:") diff --git a/var/spack/repos/builtin/packages/ossp-uuid/package.py b/var/spack/repos/builtin/packages/ossp-uuid/package.py index 24029387f5..1db80850dd 100644 --- a/var/spack/repos/builtin/packages/ossp-uuid/package.py +++ b/var/spack/repos/builtin/packages/ossp-uuid/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import sys + from spack.package import * @@ -22,7 +24,8 @@ class OsspUuid(AutotoolsPackage): depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated - provides("uuid") + if sys.platform not in ["darwin", "win32"]: + provides("uuid") @property def libs(self): diff --git a/var/spack/repos/builtin/packages/util-linux-uuid/package.py b/var/spack/repos/builtin/packages/util-linux-uuid/package.py index 4b8171e5ba..554158491b 100644 --- a/var/spack/repos/builtin/packages/util-linux-uuid/package.py +++ b/var/spack/repos/builtin/packages/util-linux-uuid/package.py @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import sys + from spack.package import * @@ -29,7 +31,8 @@ class UtilLinuxUuid(AutotoolsPackage): depends_on("pkgconfig", type="build") - provides("uuid") + if sys.platform not in ["darwin", "win32"]: + provides("uuid") def url_for_version(self, version): url = "https://www.kernel.org/pub/linux/utils/util-linux/v{0}/util-linux-{1}.tar.gz" |