From a16aefc98bcb7f2907f613335e9d22b2a3fde0e6 Mon Sep 17 00:00:00 2001 From: crivella Date: Mon, 20 Oct 2025 11:47:56 +0200 Subject: [PATCH 1/2] Apply changes from #24308 to all other spdlog ECs --- .../s/spdlog/spdlog-1.10.0-GCCcore-11.2.0.eb | 8 ++++++++ .../s/spdlog/spdlog-1.11.0-GCCcore-12.2.0.eb | 8 ++++++++ .../s/spdlog/spdlog-1.11.0-GCCcore-12.3.0.eb | 8 ++++++++ .../s/spdlog/spdlog-1.12.0-GCCcore-13.3.0.eb | 8 +++++++- .../s/spdlog/spdlog-1.15.3-GCCcore-14.2.0.eb | 10 +++++++++- .../s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb | 10 +++++++++- 6 files changed, 49 insertions(+), 3 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 abc8066853a3..9d3ea3554070 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 @@ -6,6 +6,7 @@ version = '1.10.0' homepage = 'https://github.com/gabime/spdlog' description = 'Very fast, header-only/compiled, C++ logging library.' toolchain = {'name': 'GCCcore', 'version': '11.2.0'} +toolchainopts = {'pic': True} source_urls = ['https://github.com/gabime/spdlog/archive/refs/tags/'] sources = ['v%(version)s.tar.gz'] @@ -16,6 +17,13 @@ builddependencies = [ ('CMake', '3.21.1'), ] +_shared_configopts = " ".join([ + "-DSPDLOG_BUILD_SHARED=ON", + "-DSPDLOG_BUILD_PIC=ON", +]) + +configopts = ["", _shared_configopts] + sanity_check_paths = { 'files': ['include/spdlog/spdlog.h'], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], 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 37e99e711245..14b70e897e70 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 @@ -6,6 +6,7 @@ version = '1.11.0' homepage = 'https://github.com/gabime/spdlog' description = 'Very fast, header-only/compiled, C++ logging library.' toolchain = {'name': 'GCCcore', 'version': '12.2.0'} +toolchainopts = {'pic': True} source_urls = ['https://github.com/gabime/spdlog/archive/refs/tags/'] sources = ['v%(version)s.tar.gz'] @@ -16,6 +17,13 @@ builddependencies = [ ('CMake', '3.24.3'), ] +_shared_configopts = " ".join([ + "-DSPDLOG_BUILD_SHARED=ON", + "-DSPDLOG_BUILD_PIC=ON", +]) + +configopts = ["", _shared_configopts] + sanity_check_paths = { 'files': ['include/spdlog/spdlog.h'], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], 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 72f5f9a9923e..2bddb11a812f 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 @@ -6,6 +6,7 @@ version = '1.11.0' homepage = 'https://github.com/gabime/spdlog' description = 'Very fast, header-only/compiled, C++ logging library.' toolchain = {'name': 'GCCcore', 'version': '12.3.0'} +toolchainopts = {'pic': True} source_urls = ['https://github.com/gabime/spdlog/archive/refs/tags/'] sources = ['v%(version)s.tar.gz'] @@ -16,6 +17,13 @@ builddependencies = [ ('CMake', '3.26.3'), ] +_shared_configopts = " ".join([ + "-DSPDLOG_BUILD_SHARED=ON", + "-DSPDLOG_BUILD_PIC=ON", +]) + +configopts = ["", _shared_configopts] + sanity_check_paths = { 'files': ['include/spdlog/spdlog.h'], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], 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 eead2698148a..fe2d07dfa4d5 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 @@ -5,8 +5,8 @@ version = '1.12.0' homepage = 'https://github.com/gabime/spdlog' description = "Very fast, header-only/compiled, C++ logging library." - toolchain = {'name': 'GCCcore', 'version': '13.3.0'} +toolchainopts = {'pic': True} source_urls = ['https://github.com/gabime/%(name)s/archive/refs/tags/'] sources = ['v%(version)s.tar.gz'] @@ -17,6 +17,12 @@ builddependencies = [ ('CMake', '3.29.3'), ] +_shared_configopts = " ".join([ + "-DSPDLOG_BUILD_SHARED=ON", + "-DSPDLOG_BUILD_PIC=ON", +]) + +configopts = ["", _shared_configopts] sanity_check_paths = { 'files': ['include/%(name)s/%(name)s.h'], 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 7b1f2627bcb3..a3c8826b973d 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 @@ -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.2.0'} +toolchainopts = {'pic': True} source_urls = ['https://github.com/gabime/%(name)s/archive/refs/tags/'] sources = ['v%(version)s.tar.gz'] @@ -16,6 +16,14 @@ builddependencies = [ ('binutils', '2.42'), ('CMake', '3.31.3'), ] + +_shared_configopts = " ".join([ + "-DSPDLOG_BUILD_SHARED=ON", + "-DSPDLOG_BUILD_PIC=ON", +]) + +configopts = ["", _shared_configopts] + sanity_check_paths = { 'files': ['include/%(name)s/%(name)s.h'], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], 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 bc174194d0dc..738a7d6faa39 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'] @@ -16,6 +16,14 @@ builddependencies = [ ('binutils', '2.44'), ('CMake', '4.0.3'), ] + +_shared_configopts = " ".join([ + "-DSPDLOG_BUILD_SHARED=ON", + "-DSPDLOG_BUILD_PIC=ON", +]) + +configopts = ["", _shared_configopts] + sanity_check_paths = { 'files': ['include/%(name)s/%(name)s.h'], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], From f80db35446e4926bd65e8e53a53675216da2aae5 Mon Sep 17 00:00:00 2001 From: crivella Date: Mon, 20 Oct 2025 11:55:09 +0200 Subject: [PATCH 2/2] Added sanity checks --- easybuild/easyconfigs/s/spdlog/spdlog-1.10.0-GCCcore-11.2.0.eb | 2 +- easybuild/easyconfigs/s/spdlog/spdlog-1.11.0-GCCcore-12.2.0.eb | 2 +- easybuild/easyconfigs/s/spdlog/spdlog-1.11.0-GCCcore-12.3.0.eb | 2 +- easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.3.0.eb | 2 +- easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.2.0.eb | 2 +- easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.3.0.eb | 2 +- 6 files changed, 6 insertions(+), 6 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 9d3ea3554070..dab37dd9793f 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 @@ -25,7 +25,7 @@ _shared_configopts = " ".join([ configopts = ["", _shared_configopts] sanity_check_paths = { - 'files': ['include/spdlog/spdlog.h'], + 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], } 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 14b70e897e70..0571af33da10 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 @@ -25,7 +25,7 @@ _shared_configopts = " ".join([ configopts = ["", _shared_configopts] sanity_check_paths = { - 'files': ['include/spdlog/spdlog.h'], + 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], } 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 2bddb11a812f..a761400d3b1b 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 @@ -25,7 +25,7 @@ _shared_configopts = " ".join([ configopts = ["", _shared_configopts] sanity_check_paths = { - 'files': ['include/spdlog/spdlog.h'], + 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], } 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 fe2d07dfa4d5..697923df8ae5 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 @@ -25,7 +25,7 @@ _shared_configopts = " ".join([ configopts = ["", _shared_configopts] sanity_check_paths = { - 'files': ['include/%(name)s/%(name)s.h'], + 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], } 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 a3c8826b973d..6d1042be4454 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 @@ -25,7 +25,7 @@ _shared_configopts = " ".join([ configopts = ["", _shared_configopts] sanity_check_paths = { - 'files': ['include/%(name)s/%(name)s.h'], + 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], } 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 738a7d6faa39..e66d8f5adbcd 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 @@ -25,7 +25,7 @@ _shared_configopts = " ".join([ configopts = ["", _shared_configopts] sanity_check_paths = { - 'files': ['include/%(name)s/%(name)s.h'], + 'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'], 'dirs': ['lib64/cmake', 'lib64/pkgconfig'], }