From 7d567ae94250b4486ed80cc33704f58fbae4c2a7 Mon Sep 17 00:00:00 2001 From: sassy Date: Wed, 29 Oct 2025 09:51:29 +0000 Subject: [PATCH 1/4] Dynamic library build and test job added --- .../s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb b/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb index e66d8f5adbcd..c001ea7d2689 100644 --- a/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb +++ b/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb @@ -5,8 +5,8 @@ version = '1.15.3' homepage = 'https://github.com/gabime/spdlog' description = "Very fast, header-only/compiled, C++ logging library." + toolchain = {'name': 'GCCcore', 'version': '14.3.0'} -toolchainopts = {'pic': True} source_urls = ['https://github.com/gabime/%(name)s/archive/refs/tags/'] sources = ['v%(version)s.tar.gz'] @@ -17,15 +17,13 @@ builddependencies = [ ('CMake', '4.0.3'), ] -_shared_configopts = " ".join([ - "-DSPDLOG_BUILD_SHARED=ON", - "-DSPDLOG_BUILD_PIC=ON", -]) +_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON' +configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')] -configopts = ["", _shared_configopts] +runtest = 'test' sanity_check_paths = { - 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], + 'files': ['include/%(name)s/%(name)s.h', 'lib/libspdlog.a', 'lib/libspdlog.%s' % SHLIB_EXT], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], } From efaa57933bf3e15ecbb033b44a94c4679dccab5c Mon Sep 17 00:00:00 2001 From: sassy Date: Wed, 29 Oct 2025 10:51:09 +0000 Subject: [PATCH 2/4] PIC support added --- easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb b/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb index c001ea7d2689..1892acda4603 100644 --- a/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb +++ b/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb @@ -7,6 +7,7 @@ homepage = 'https://github.com/gabime/spdlog' description = "Very fast, header-only/compiled, C++ logging library." toolchain = {'name': 'GCCcore', 'version': '14.3.0'} +toolchainopts = {'pic': True} source_urls = ['https://github.com/gabime/%(name)s/archive/refs/tags/'] sources = ['v%(version)s.tar.gz'] @@ -23,7 +24,7 @@ configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', ' runtest = 'test' sanity_check_paths = { - 'files': ['include/%(name)s/%(name)s.h', 'lib/libspdlog.a', 'lib/libspdlog.%s' % SHLIB_EXT], + 'files': [f'include/{name}/{name}.h', 'lib/libspdlog.a', 'lib/libspdlog.%s' % SHLIB_EXT], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], } From 4a9d515790d41ff93a7130b96feec270735b6c88 Mon Sep 17 00:00:00 2001 From: sassy Date: Wed, 29 Oct 2025 13:45:56 +0000 Subject: [PATCH 3/4] check for shared/static libs added, missing configopts added --- .../easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb b/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb index 1892acda4603..6e29737d3bd7 100644 --- a/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb +++ b/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb @@ -18,13 +18,15 @@ builddependencies = [ ('CMake', '4.0.3'), ] -_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON' +_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_SHARED=ON ' +_base_configopts += '-DSPDLOG_BUILD_PIC=ON ' + configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')] runtest = 'test' sanity_check_paths = { - 'files': [f'include/{name}/{name}.h', 'lib/libspdlog.a', 'lib/libspdlog.%s' % SHLIB_EXT], + 'files': [f'include/{name}/{name}.h', 'lib/libspdlog.a', f'lib/libspdlog.{SHLIB_EXT}'], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], } From cdcaaec5fd209171ee3ce7187cac32dde01f0a21 Mon Sep 17 00:00:00 2001 From: sassy Date: Wed, 29 Oct 2025 13:47:36 +0000 Subject: [PATCH 4/4] configopts corrected --- easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb b/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb index 6e29737d3bd7..a8b2f0740567 100644 --- a/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb +++ b/easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb @@ -18,8 +18,7 @@ builddependencies = [ ('CMake', '4.0.3'), ] -_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_SHARED=ON ' -_base_configopts += '-DSPDLOG_BUILD_PIC=ON ' +_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON ' configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')]