From f02cf8aff5860c86291f38492091dc2a887d46d9 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 14 Aug 2023 19:34:12 -0600 Subject: [PATCH] Detect external libiconv and make libiconv and git non-buildable on macOS (#710) * Update .gitmodules and submodule pointer for spack for code review and testing * Remove hardcoded external libiconv from configs/sites/macos.default/packages.yaml, make git and libiconv non-buildable * Revert .gitmodules and update submodule pointer for spack --- configs/sites/macos.default/packages.yaml | 9 ++++----- spack | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/sites/macos.default/packages.yaml b/configs/sites/macos.default/packages.yaml index 08c7436e1..f08498c65 100644 --- a/configs/sites/macos.default/packages.yaml +++ b/configs/sites/macos.default/packages.yaml @@ -1,10 +1,9 @@ packages: + cairo: + variants: ~png ~svg + git: + buildable: false libiconv: buildable: false - externals: - - spec: libiconv@1.17 - prefix: /usr wgrib2: variants: ~openmp - cairo: - variants: ~png ~svg diff --git a/spack b/spack index d00539433..95718234e 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit d00539433606d917b3c45b8e6c5990485744a009 +Subproject commit 95718234e20886b0507d337ef7e18dedf2aaecc7