From 45b4ef8b324add3e085e0742295619299587fca9 Mon Sep 17 00:00:00 2001
From: "Fabian.Jakub" <fabian@jakub.com>
Date: Fri, 24 Mar 2023 13:52:30 +0100
Subject: [PATCH] remove gettext dep from default spack icon.build_cmd
---
conf/common/build.yml | 2 +-
templates/common/build_icon.sh | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/conf/common/build.yml b/conf/common/build.yml
index 249a1af..9b3cedb 100644
--- a/conf/common/build.yml
+++ b/conf/common/build.yml
@@ -12,7 +12,7 @@ spack:
disable_local_config: true # if false, spack install into home folder
icon:
- build_cmd: "icon-nwp@%ICON.VERSION%% %SPACK.COMPILER% ^openmpi+pmi+legacylaunchers schedulers=slurm fabrics=ucx ucx+dc+dm+ib_hw_tm+mlx5_dv+rc+rdmacm+thread_multiple+ud+verbs ^gettext@0.20.2 "
+ build_cmd: "icon-nwp@%ICON.VERSION%% %SPACK.COMPILER% target=x86_64_v2 ^openmpi+pmi+legacylaunchers schedulers=slurm fabrics=ucx ucx+dc+dm+ib_hw_tm+mlx5_dv+rc+rdmacm+thread_multiple+ud+verbs"
version: 2.6.5-nwp0
python_environment:
diff --git a/templates/common/build_icon.sh b/templates/common/build_icon.sh
index 67c648a..3307881 100644
--- a/templates/common/build_icon.sh
+++ b/templates/common/build_icon.sh
@@ -16,8 +16,7 @@ cd ${WORKDIR}
load_spack "%spack.init%" "%spack.root%" "%spack.url%" "%spack.branch%" "%spack.compiler%" "%spack.disable_local_config%" "%spack.user_cache_path%" "%spack.user_config_path%"
-
-SPACK_BUILD_ICON="%spack.build_cmd%"
+SPACK_BUILD_ICON="%ICON.BUILD_CMD%"
if [ ! -z "$SPACK_BUILD_ICON" ]; then
echo "Installing ICON with spack!"
echo "cmd=$SPACK_BUILD_ICON"
--
GitLab