From 6f5e6f3a5b0a99f1ed48be51cf2550caeaa9c3a7 Mon Sep 17 00:00:00 2001
From: Massimiliano Culpo <massimiliano.culpo@gmail.com>
Date: Fri, 13 Sep 2024 10:49:51 +0200
Subject: [PATCH] Deprecate packages:all:compiler and update default configs

Signed-off-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
---
 etc/spack/defaults/darwin/packages.yaml  | 7 +++----
 etc/spack/defaults/packages.yaml         | 7 +++----
 etc/spack/defaults/windows/packages.yaml | 4 ++--
 lib/spack/spack/schema/packages.py       | 9 +++++++++
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/etc/spack/defaults/darwin/packages.yaml b/etc/spack/defaults/darwin/packages.yaml
index 6aba11f2738..64f2d02c543 100644
--- a/etc/spack/defaults/darwin/packages.yaml
+++ b/etc/spack/defaults/darwin/packages.yaml
@@ -15,12 +15,11 @@
 # -------------------------------------------------------------------------
 packages:
   all:
-    compiler:
-    - apple-clang
-    - clang
-    - gcc
     providers:
+      c: [apple-clang, llvm, gcc]
+      cxx: [apple-clang, llvm, gcc]
       elf: [libelf]
+      fortran: [gcc]
       fuse: [macfuse]
       gl: [apple-gl]
       glu: [apple-glu]
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml
index dda4b83eab2..dc4b6b06876 100644
--- a/etc/spack/defaults/packages.yaml
+++ b/etc/spack/defaults/packages.yaml
@@ -15,19 +15,18 @@
 # -------------------------------------------------------------------------
 packages:
   all:
-    compiler: [gcc, clang, oneapi, xl, nag, fj, aocc]
     providers:
       awk: [gawk]
       armci: [armcimpi]
       blas: [openblas, amdblis]
-      c: [gcc]
-      cxx: [gcc]
+      c: [gcc, llvm, intel-oneapi-compilers, xl, aocc]
+      cxx: [gcc, llvm, intel-oneapi-compilers, xl, aocc]
       D: [ldc]
       daal: [intel-oneapi-daal]
       elf: [elfutils]
       fftw-api: [fftw, amdfftw]
       flame: [libflame, amdlibflame]
-      fortran: [gcc]
+      fortran: [gcc, llvm]
       fortran-rt: [gcc-runtime, intel-oneapi-runtime]
       fuse: [libfuse]
       gl: [glx, osmesa]
diff --git a/etc/spack/defaults/windows/packages.yaml b/etc/spack/defaults/windows/packages.yaml
index c72ba8c0330..9d97fd5b6f8 100644
--- a/etc/spack/defaults/windows/packages.yaml
+++ b/etc/spack/defaults/windows/packages.yaml
@@ -15,8 +15,8 @@
 # -------------------------------------------------------------------------
 packages:
   all:
-    compiler:
-    - msvc
     providers:
+      c : [msvc]
+      cxx: [msvc]
       mpi: [msmpi]
       gl: [wgl]
diff --git a/lib/spack/spack/schema/packages.py b/lib/spack/spack/schema/packages.py
index e16ba1f14bb..55f2d650b04 100644
--- a/lib/spack/spack/schema/packages.py
+++ b/lib/spack/spack/schema/packages.py
@@ -138,6 +138,15 @@
                     },
                     "variants": variants,
                 },
+                "deprecatedProperties": [
+                    {
+                        "names": ["compiler"],
+                        "message": "The packages:all:compiler preference has been deprecated in "
+                        "Spack v0.24, and is currently ignored. It will be removed from config in "
+                        "Spack v0.26.",
+                        "error": False,
+                    }
+                ],
             }
         },
         "patternProperties": {