From 1c2f194d7730934b4cfca7329f74bf5426654888 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 5 Jun 2025 05:33:34 -0600 Subject: [PATCH 1/8] Add conflict for scotch with oneapi --- var/spack/repos/builtin/packages/scotch/package.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 9a5e91360b445e..1f55cb87122290 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -86,6 +86,9 @@ class Scotch(CMakePackage, MakefilePackage): conflicts("metis", when="+metis") conflicts("parmetis", when="+metis") + # ISSUE HERE + conflicts("@oneapi") + parallel = False # NOTE: Versions of Scotch up to version 6.0.0 don't include support for From 340d43dbd80cc531c3b13e6d100dad57f0a51287 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 6 Jun 2025 07:38:27 -0600 Subject: [PATCH 2/8] Update issue in var/spack/repos/builtin/packages/scotch/package.py --- var/spack/repos/builtin/packages/scotch/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 1f55cb87122290..128b7bfc125408 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -86,7 +86,8 @@ class Scotch(CMakePackage, MakefilePackage): conflicts("metis", when="+metis") conflicts("parmetis", when="+metis") - # ISSUE HERE + # https://github.com/ufs-community/ufs-weather-model/pull/2650 + # replace with spack-package issue once created conflicts("@oneapi") parallel = False From b264d05b71dfdd4d3df707f7734f2a8f15c52f76 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 9 Jun 2025 11:15:57 -0600 Subject: [PATCH 3/8] Update var/spack/repos/builtin/packages/scotch/package.py --- var/spack/repos/builtin/packages/scotch/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 128b7bfc125408..f45259823c52bc 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -87,7 +87,7 @@ class Scotch(CMakePackage, MakefilePackage): conflicts("parmetis", when="+metis") # https://github.com/ufs-community/ufs-weather-model/pull/2650 - # replace with spack-package issue once created + # https://github.com/spack/spack-packages/issues/161 conflicts("@oneapi") parallel = False From 850e5bf80290d32be2f8a5b2ff51f4b3b2fd480d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 9 Jun 2025 16:06:52 -0600 Subject: [PATCH 4/8] Add mapl@2.53.4 --- var/spack/repos/builtin/packages/mapl/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/mapl/package.py b/var/spack/repos/builtin/packages/mapl/package.py index b070be4f1c8fb3..78e40df7c6829d 100644 --- a/var/spack/repos/builtin/packages/mapl/package.py +++ b/var/spack/repos/builtin/packages/mapl/package.py @@ -40,6 +40,7 @@ class Mapl(CMakePackage): version("2.54.2", sha256="70b7be425d07a7be7d9bb0e53b93a372887a048caf23260e0ae602ca6e3670ed") version("2.54.1", sha256="2430ded45a98989e9100037f54cf22f5a5083e17196514b3667d3003413e49e1") + version("2.53.4", sha256="da38348a72fcbaa2b888578bfa630ab36261206136d33700344ed6792f9f9aeb") version("2.53.2", sha256="0f294a5289541b0028773f8e5ab2bf04734ec09241baa5a3dcea0e939d40336f") version("2.53.1", sha256="8371a75d4d81294eb9d99d66702f8cf62d4bd954cec3e247e1afae621b4e4726") version("2.53.0", sha256="68c24e6c0e3340645b1fb685972c96ef80746d5a289572c9883e520680708ebe") From b3d1298634392b6978bfb8a3a63ce8ca222a0194 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 17:40:14 +0000 Subject: [PATCH 5/8] scotch: fix oneapi conflict logic --- var/spack/repos/builtin/packages/scotch/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index f45259823c52bc..ef4920a3fe8481 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -88,7 +88,7 @@ class Scotch(CMakePackage, MakefilePackage): # https://github.com/ufs-community/ufs-weather-model/pull/2650 # https://github.com/spack/spack-packages/issues/161 - conflicts("@oneapi") + conflicts("%oneapi") parallel = False From a84af873b94bc63a233b269d5bad1b42fc6b2fd1 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 15:26:14 +0000 Subject: [PATCH 6/8] scotch: add 7.0.7 --- var/spack/repos/builtin/packages/scotch/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index ef4920a3fe8481..c1dca919cfe250 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -19,6 +19,7 @@ class Scotch(CMakePackage, MakefilePackage): maintainers("pghysels") + version("7.0.7", sha256="02084471d2ca525f8a59b4bb8c607eb5cca452d6a38cf5c89f5f92f7edc1a5b5") version("7.0.6", sha256="b44acd0d2f53de4b578fa3a88944cccc45c4d2961cd8cefa9b9a1d5431de8e2b") version("7.0.4", sha256="8ef4719d6a3356e9c4ca7fefd7e2ac40deb69779a5c116f44da75d13b3d2c2c3") version("7.0.3", sha256="5b5351f0ffd6fcae9ae7eafeccaa5a25602845b9ffd1afb104db932dd4d4f3c5") From 6686b09158c8c25879549e9ce0835b0c8466a1f3 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 15:26:00 +0000 Subject: [PATCH 7/8] mapl: add 2.53.4 From e087ecf85345f184895c7428044dd74a897ff880 Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Tue, 10 Jun 2025 15:22:51 +0000 Subject: [PATCH 8/8] qt: explicitly disable vulkan; always disable location if disabled --- var/spack/repos/builtin/packages/qt/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index effa6e42035434..ea11a84165be0a 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -636,6 +636,8 @@ def common_config_args(self): use_spack_dep("freetype") if spec.satisfies("platform=linux") or spec.satisfies("platform=freebsd"): config_args.append("-fontconfig") + # Explicitly disable vulkan to avoid build-time bug; this could be a variant + config_args.append("-no-vulkan") else: config_args.append("-no-freetype") config_args.append("-no-gui") @@ -815,8 +817,7 @@ def configure(self, spec, prefix): config_args.extend(["-skip", "wayland"]) if "~location" in spec: - if version >= Version("5.15"): - config_args.extend(["-skip", "qtlocation"]) + config_args.extend(["-skip", "qtlocation"]) if IS_WINDOWS: config_args.extend(["-skip", "qtspeech"])