Skip to content

Commit 1eb765d

Browse files
authored
Try to fix ecl subproject
1 parent 6d7fe91 commit 1eb765d

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

pyproject.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ requires = [
1313
'numpy >=1.25',
1414
'jinja2'
1515
]
16+
[tool.meson-python.args]
17+
# Prevent meson from trying to install the autoconf subprojects
18+
# otherwise we hit https://github.com/mesonbuild/meson-python/issues/598
19+
# The subprojects have to set the rpath to the build directory, which should work as long as
20+
# we don't use build isolation.
21+
install = ['--skip-subprojects', 'ecl']
22+
1623
[project]
1724
name = "sagemath"
1825
description = "Sage: Open Source Mathematics Software: Standard Python Library"
Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
proj = mod.add_project('configure',
22
configure_options : [
3-
'--enable-manual=no',
4-
'--enable-unicode=yes',
5-
'--with-defsystem'
3+
'--enable-manual=no',
4+
'--enable-unicode=yes',
5+
'--with-defsystem',
66
],
77
)
88

99
ecl_dep = proj.dependency('ecl')
10+
# Ugly workaround to include the rpath in the dependency
11+
# https://github.com/mesonbuild/meson/issues/12970
12+
ecl_rpath_dep = declare_dependency(link_args: '-Wl,-rpath,' + meson.current_build_dir() + '/dist/usr/local/lib64')
13+
ecl_dep = declare_dependency(
14+
dependencies : [ecl_dep, ecl_rpath_dep],
15+
)
1016
meson.override_dependency('ecl', ecl_dep)

0 commit comments

Comments
 (0)