From 3359289fc4da96000619c256a223abe2ed438dfb Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 14 Aug 2023 11:14:50 -0600 Subject: [PATCH 1/3] Update .gitmodules and submodule pointer for spack for code review and testing --- .gitmodules | 10 ++++++---- spack | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index b1f475b64..35a81a61e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,11 @@ [submodule "spack"] path = spack - #url = https://github.com/spack/spack - #branch = develop - url = https://github.com/jcsda/spack - branch = jcsda_emc_spack_stack + ##url = https://github.com/spack/spack + ##branch = develop + #url = https://github.com/jcsda/spack + #branch = jcsda_emc_spack_stack + url = https://github.com/climbfuji/spack + branch = feature/detect_external_libiconv [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index d00539433..d5c705519 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit d00539433606d917b3c45b8e6c5990485744a009 +Subproject commit d5c70551996a8609beb1c40fef2ce5846d155451 From 57560f05191727078e5d896a812c1bc4696e9050 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 14 Aug 2023 11:15:48 -0600 Subject: [PATCH 2/3] Remove hardcoded external libiconv from configs/sites/macos.default/packages.yaml, make git and libiconv non-buildable --- configs/sites/macos.default/packages.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 From 80b61236ac468848a38455a2e5f16173c6a58305 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 14 Aug 2023 17:54:57 -0600 Subject: [PATCH 3/3] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 10 ++++------ spack | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 35a81a61e..b1f475b64 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,9 @@ [submodule "spack"] path = spack - ##url = https://github.com/spack/spack - ##branch = develop - #url = https://github.com/jcsda/spack - #branch = jcsda_emc_spack_stack - url = https://github.com/climbfuji/spack - branch = feature/detect_external_libiconv + #url = https://github.com/spack/spack + #branch = develop + url = https://github.com/jcsda/spack + branch = jcsda_emc_spack_stack [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index d5c705519..95718234e 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit d5c70551996a8609beb1c40fef2ce5846d155451 +Subproject commit 95718234e20886b0507d337ef7e18dedf2aaecc7