Skip to content

Commit 23d0f8b

Browse files
committed
switch to released sleef-3.9
1 parent de9d7e1 commit 23d0f8b

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

‎meson.build‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ endif
1616
qblas_dep = dependency('qblas', fallback: ['qblas', 'qblas_dep'])
1717

1818
# Try to find SLEEF system-wide first, fall back to subproject if not found
19-
sleef_dep = dependency('sleef', fallback: ['sleef', 'sleef_dep'], required: false)
19+
# Required SLEEF version (must match sleef.wrap revision)
20+
required_sleef_version = '3.9.0'
21+
sleef_dep = dependency('sleef', version: '>=' + required_sleef_version, fallback: ['sleef', 'sleef_dep'], required: false)
2022

2123
use_system_sleef = false
2224
fallback_reason = ''
2325

24-
if sleef_dep.found() and sleef_dep.type_name() != 'internal'
26+
if sleef_dep.found() and sleef_dep.type_name() != 'internal' and sleef_dep.version().startswith(required_sleef_version)
2527
# SLEEF found system-wide - verify quad-precision support
2628
cpp = meson.get_compiler('cpp')
2729
sleefquad_lib = cpp.find_library('sleefquad', required: false)
@@ -60,7 +62,11 @@ if sleef_dep.found() and sleef_dep.type_name() != 'internal'
6062
fallback_reason = 'System-wide SLEEF installation does not have a sleefquad library.'
6163
endif
6264
else
63-
fallback_reason = 'Cannot find system-wide SLEEF installation.'
65+
if sleef_dep.found() and sleef_dep.type_name() != 'internal'
66+
fallback_reason = 'System SLEEF version @0@ does not match required version @1@'.format(sleef_dep.version(), required_sleef_version)
67+
else
68+
fallback_reason = 'Cannot find system-wide SLEEF installation.'
69+
endif
6470
endif
6571

6672
if use_system_sleef

‎subprojects/packagefiles/sleef/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,5 @@ sleefquad_dep = declare_dependency(
7777
tlfloat_dep = declare_dependency(
7878
dependencies: [sleef_build_dep],
7979
compile_args: compile_args_list,
80-
link_args: ['-L' + meson.current_build_dir() / sleef_install_dir / 'lib', '-L' + meson.current_build_dir() / sleef_install_dir / 'lib64', '-ltlfloat']
80+
link_args: ['-L' + meson.current_build_dir() / sleef_install_dir / 'lib', '-L' + meson.current_build_dir() / sleef_install_dir / 'lib64', '-L' + meson.current_build_dir() / sleef_build_dir / 'submodules' / 'tlfloat' / 'lib', '-L' + meson.current_build_dir() / sleef_build_dir / 'submodules' / 'tlfloat' / 'lib64', '-ltlfloat']
8181
)

‎subprojects/sleef.wrap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[wrap-git]
22
directory=sleef
33
url=https://github.com/shibatch/sleef.git
4-
revision=43a0252ba9331adc7fb10755021f802863678c38
4+
revision=3.9.0
55
patch_directory=sleef
66

77
[provide]

0 commit comments

Comments
 (0)