Skip to content

Commit 9e773d1

Browse files
committed
Apply changes from easybuilders#24391 to all versions. Als fix potential missing PIC in static library
1 parent d95dcff commit 9e773d1

7 files changed

+32
-32
lines changed

easybuild/easyconfigs/s/spdlog/spdlog-1.10.0-GCCcore-11.2.0.eb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ builddependencies = [
1717
('CMake', '3.21.1'),
1818
]
1919

20-
_shared_configopts = " ".join([
21-
"-DSPDLOG_BUILD_SHARED=ON",
22-
"-DSPDLOG_BUILD_PIC=ON",
23-
])
20+
_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON '
2421

25-
configopts = ["", _shared_configopts]
22+
configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')]
23+
24+
runtest = 'test'
2625

2726
sanity_check_paths = {
2827
'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'],

easybuild/easyconfigs/s/spdlog/spdlog-1.11.0-GCCcore-12.2.0.eb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ builddependencies = [
1717
('CMake', '3.24.3'),
1818
]
1919

20-
_shared_configopts = " ".join([
21-
"-DSPDLOG_BUILD_SHARED=ON",
22-
"-DSPDLOG_BUILD_PIC=ON",
23-
])
20+
_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON '
2421

25-
configopts = ["", _shared_configopts]
22+
configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')]
23+
24+
runtest = 'test'
2625

2726
sanity_check_paths = {
2827
'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'],

easybuild/easyconfigs/s/spdlog/spdlog-1.11.0-GCCcore-12.3.0.eb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ builddependencies = [
1717
('CMake', '3.26.3'),
1818
]
1919

20-
_shared_configopts = " ".join([
21-
"-DSPDLOG_BUILD_SHARED=ON",
22-
"-DSPDLOG_BUILD_PIC=ON",
23-
])
20+
_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON '
2421

25-
configopts = ["", _shared_configopts]
22+
configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')]
23+
24+
runtest = 'test'
2625

2726
sanity_check_paths = {
2827
'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'],

easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.2.0.eb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ builddependencies = [
1717
('CMake', '3.27.6'),
1818
]
1919

20-
_shared_configopts = " ".join([
21-
"-DSPDLOG_BUILD_SHARED=ON",
22-
"-DSPDLOG_BUILD_PIC=ON",
23-
])
20+
_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON '
2421

25-
configopts = ["", _shared_configopts]
22+
configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')]
23+
24+
runtest = 'test'
2625

2726
sanity_check_paths = {
2827
'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'],

easybuild/easyconfigs/s/spdlog/spdlog-1.12.0-GCCcore-13.3.0.eb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ builddependencies = [
1717
('CMake', '3.29.3'),
1818
]
1919

20-
_shared_configopts = " ".join([
21-
"-DSPDLOG_BUILD_SHARED=ON",
22-
"-DSPDLOG_BUILD_PIC=ON",
23-
])
20+
_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON '
2421

25-
configopts = ["", _shared_configopts]
22+
configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')]
23+
24+
runtest = 'test'
2625

2726
sanity_check_paths = {
2827
'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'],

easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-13.3.0.eb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@ builddependencies = [
1717
('CMake', '3.29.3'),
1818
]
1919

20+
_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON '
21+
22+
configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')]
23+
24+
runtest = 'test'
25+
2026
sanity_check_paths = {
21-
'files': ['include/spdlog/spdlog.h', 'lib/libspdlog.a'],
22-
'dirs': ['lib/cmake', 'lib/pkgconfig'],
27+
'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'],
28+
'dirs': ['lib64/cmake', 'lib64/pkgconfig'],
2329
}
2430

2531
moduleclass = 'lib'

easybuild/easyconfigs/s/spdlog/spdlog-1.15.3-GCCcore-14.2.0.eb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ builddependencies = [
1717
('CMake', '3.31.3'),
1818
]
1919

20-
_shared_configopts = " ".join([
21-
"-DSPDLOG_BUILD_SHARED=ON",
22-
"-DSPDLOG_BUILD_PIC=ON",
23-
])
20+
_base_configopts = ' -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_PIC=ON '
2421

25-
configopts = ["", _shared_configopts]
22+
configopts = [f'{_base_configopts} -DSPDLOG_BUILD_SHARED={x}' for x in ('OFF', 'ON')]
23+
24+
runtest = 'test'
2625

2726
sanity_check_paths = {
2827
'files': ['include/%(name)s/%(name)s.h', 'lib/lib%(name)s.a', f'lib/lib%(name)s.{SHLIB_EXT}'],

0 commit comments

Comments
 (0)