From 165bb8175398047e0384529e684413db255d344e Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Sat, 28 Jan 2023 12:18:36 +0000 Subject: [PATCH] fix CMake print summary for long hostnames for NECI --- .../n/NECI/NECI-20220711-foss-2022a.eb | 6 +++++- .../NECI-20220711_fix-cmake-print-summary.patch | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 easybuild/easyconfigs/n/NECI/NECI-20220711_fix-cmake-print-summary.patch diff --git a/easybuild/easyconfigs/n/NECI/NECI-20220711-foss-2022a.eb b/easybuild/easyconfigs/n/NECI/NECI-20220711-foss-2022a.eb index 71c70f8ab4a..91ea5a5d835 100644 --- a/easybuild/easyconfigs/n/NECI/NECI-20220711-foss-2022a.eb +++ b/easybuild/easyconfigs/n/NECI/NECI-20220711-foss-2022a.eb @@ -19,7 +19,11 @@ sources = [{ }, 'filename': SOURCE_TAR_GZ, }] -checksums = [None] +patches = ['NECI-20220711_fix-cmake-print-summary.patch'] +checksums = [ + None, + 'e189f1b3991b28502dbd8285a04784e7e422d0a9e01e3f28025d0458b479af2d', +] builddependencies = [ ('CMake', '3.23.1'), diff --git a/easybuild/easyconfigs/n/NECI/NECI-20220711_fix-cmake-print-summary.patch b/easybuild/easyconfigs/n/NECI/NECI-20220711_fix-cmake-print-summary.patch new file mode 100644 index 00000000000..000e4879148 --- /dev/null +++ b/easybuild/easyconfigs/n/NECI/NECI-20220711_fix-cmake-print-summary.patch @@ -0,0 +1,15 @@ +If the _content passed to the box_side macro is too long then it fails +Patch by Simon Branford (University of Birmingham) +--- cmake/neci_print_summary.cmake.orig 2023-01-28 12:12:05.844153000 +0000 ++++ cmake/neci_print_summary.cmake 2023-01-28 12:12:26.698259000 +0000 +@@ -28,9 +28,7 @@ + feature_summary( WHAT ALL INCLUDE_QUIET_PACKAGES) + + macro( box_side _content ) +- string( LENGTH "${_content}" _len ) +- string( SUBSTRING " |" ${_len} -1 _box_tail ) +- message( STATUS " | ${_content}${_box_tail}" ) ++ message( STATUS " | ${_content} |" ) + endmacro() + + string(TIMESTAMP _time "%Y-%m-%d %H:%M")