diff --git a/easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.2.0-pic.eb b/easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.2.0-pic.eb deleted file mode 100644 index 7224490cebab..000000000000 --- a/easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.2.0-pic.eb +++ /dev/null @@ -1,34 +0,0 @@ -easyblock = 'CMakeMake' - -name = 'spdlog' -version = '1.12.0' -versionsuffix = '-pic' - -homepage = 'https://github.com/gabime/spdlog' -description = 'Very fast, header-only/compiled, C++ logging library' - -toolchain = {'name': 'GCCcore', 'version': '13.2.0'} -toolchainopts = {'pic': True} -build_shared_libs = True - -source_urls = ['https://github.com/gabime/spdlog/archive/refs/tags/'] -sources = ['v%(version)s.tar.gz'] -checksums = ['4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9'] - -builddependencies = [ - ('CMake', '3.27.6'), - ('binutils', '2.40'), - ('make', '4.4.1'), -] - -configopts = " ".join([ - "-DSPDLOG_BUILD_SHARED=ON", - "-DSPDLOG_BUILD_PIC=ON", -]) - -sanity_check_paths = { - 'files': ['include/spdlog/spdlog.h', 'lib/libspdlog.so'], - 'dirs': ['lib/cmake', 'lib/pkgconfig'], -} - -moduleclass = 'lib' 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 5e53029c10d1..515e27c9c976 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 @@ -6,6 +6,7 @@ version = '1.12.0' homepage = 'https://github.com/gabime/spdlog' description = 'Very fast, header-only/compiled, C++ logging library.' toolchain = {'name': 'GCCcore', 'version': '13.2.0'} +toolchainopts = {'pic': True} source_urls = ['https://github.com/gabime/spdlog/archive/refs/tags/'] sources = ['v%(version)s.tar.gz'] @@ -16,8 +17,15 @@ builddependencies = [ ('CMake', '3.27.6'), ] +_shared_configopts = " ".join([ + "-DSPDLOG_BUILD_SHARED=ON", + "-DSPDLOG_BUILD_PIC=ON", +]) + +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'], }