From 9e773d1aeae9bde5c114511bc2c4750d412042f0 Mon Sep 17 00:00:00 2001 From: crivella Date: Wed, 29 Oct 2025 16:32:44 +0100 Subject: [PATCH] Apply changes from #24391 to all versions. Als fix potential missing PIC in static library --- .../s/spdlog/spdlog-1.10.0-GCCcore-11.2.0.eb | 9 ++++----- .../s/spdlog/spdlog-1.11.0-GCCcore-12.2.0.eb | 9 ++++----- .../s/spdlog/spdlog-1.11.0-GCCcore-12.3.0.eb | 9 ++++----- .../s/spdlog/spdlog-1.12.0-GCCcore-13.2.0.eb | 9 ++++----- .../s/spdlog/spdlog-1.12.0-GCCcore-13.3.0.eb | 9 ++++----- .../s/spdlog/spdlog-1.15.3-GCCcore-13.3.0.eb | 10 ++++++++-- .../s/spdlog/spdlog-1.15.3-GCCcore-14.2.0.eb | 9 ++++----- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/easybuild/easyconfigs/s/spdlog/spdlog-1.10.0-GCCcore-11.2.0.eb b/easybuild/easyconfigs/s/spdlog/spdlog-1.10.0-GCCcore-11.2.0.eb index dab37dd9793f..9d193076a639 100644 --- a/easybuild/easyconfigs/s/spdlog/spdlog-1.10.0-GCCcore-11.2.0.eb +++ b/easybuild/easyconfigs/s/spdlog/spdlog-1.10.0-GCCcore-11.2.0.eb @@ -17,12 +17,11 @@ builddependencies = [ ('CMake', '3.21.1'), ] -_shared_configopts = " ".join([ - "-DSPDLOG_BUILD_SHARED=ON", - "-DSPDLOG_BUILD_PIC=ON", -]) +_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON ' -configopts = ["", _shared_configopts] +configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')] + +runtest = 'test' sanity_check_paths = { 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], diff --git a/easybuild/easyconfigs/s/spdlog/spdlog-1.11.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/s/spdlog/spdlog-1.11.0-GCCcore-12.2.0.eb index 0571af33da10..ea3a0b80fd6e 100644 --- a/easybuild/easyconfigs/s/spdlog/spdlog-1.11.0-GCCcore-12.2.0.eb +++ b/easybuild/easyconfigs/s/spdlog/spdlog-1.11.0-GCCcore-12.2.0.eb @@ -17,12 +17,11 @@ builddependencies = [ ('CMake', '3.24.3'), ] -_shared_configopts = " ".join([ - "-DSPDLOG_BUILD_SHARED=ON", - "-DSPDLOG_BUILD_PIC=ON", -]) +_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON ' -configopts = ["", _shared_configopts] +configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')] + +runtest = 'test' sanity_check_paths = { 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], diff --git a/easybuild/easyconfigs/s/spdlog/spdlog-1.11.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/s/spdlog/spdlog-1.11.0-GCCcore-12.3.0.eb index a761400d3b1b..6b7b63ca07e0 100644 --- a/easybuild/easyconfigs/s/spdlog/spdlog-1.11.0-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/s/spdlog/spdlog-1.11.0-GCCcore-12.3.0.eb @@ -17,12 +17,11 @@ builddependencies = [ ('CMake', '3.26.3'), ] -_shared_configopts = " ".join([ - "-DSPDLOG_BUILD_SHARED=ON", - "-DSPDLOG_BUILD_PIC=ON", -]) +_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON ' -configopts = ["", _shared_configopts] +configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')] + +runtest = 'test' sanity_check_paths = { 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], diff --git a/easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.2.0.eb index 515e27c9c976..bc8568def50f 100644 --- a/easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.2.0.eb @@ -17,12 +17,11 @@ builddependencies = [ ('CMake', '3.27.6'), ] -_shared_configopts = " ".join([ - "-DSPDLOG_BUILD_SHARED=ON", - "-DSPDLOG_BUILD_PIC=ON", -]) +_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON ' -configopts = ["", _shared_configopts] +configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')] + +runtest = 'test' sanity_check_paths = { 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], diff --git a/easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.3.0.eb index 697923df8ae5..a5d327e70e3e 100644 --- a/easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.3.0.eb @@ -17,12 +17,11 @@ builddependencies = [ ('CMake', '3.29.3'), ] -_shared_configopts = " ".join([ - "-DSPDLOG_BUILD_SHARED=ON", - "-DSPDLOG_BUILD_PIC=ON", -]) +_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON ' -configopts = ["", _shared_configopts] +configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')] + +runtest = 'test' sanity_check_paths = { 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], diff --git a/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-13.3.0.eb b/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-13.3.0.eb index d725b74adaed..c4d78818e71a 100644 --- a/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-13.3.0.eb @@ -17,9 +17,15 @@ builddependencies = [ ('CMake', '3.29.3'), ] +_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON ' + +configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')] + +runtest = 'test' + sanity_check_paths = { - 'files': ['include/spdlog/spdlog.h', 'lib/libspdlog.a'], - 'dirs': ['lib/cmake', 'lib/pkgconfig'], + 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], + 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], } moduleclass = 'lib' diff --git a/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.2.0.eb b/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.2.0.eb index 6d1042be4454..2c5213cc09e3 100644 --- a/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.2.0.eb +++ b/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.2.0.eb @@ -17,12 +17,11 @@ builddependencies = [ ('CMake', '3.31.3'), ] -_shared_configopts = " ".join([ - "-DSPDLOG_BUILD_SHARED=ON", - "-DSPDLOG_BUILD_PIC=ON", -]) +_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON ' -configopts = ["", _shared_configopts] +configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')] + +runtest = 'test' sanity_check_paths = { 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'],