tboudreaux/fourdst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(python-bindings): added darwin duplicate rpath patch and fixed python rpath poiting

Browse Source 
due to a current bug in meson-python duplicate rpaths are registered in the shared object files created by meson-python. The new masos dynamic loader refuses to load shared object files with duplicate rpaths. There is a small patch script which removes any duplicates. This is a temporary but effective fix (https://github.com/mesonbuild/meson-python/issues/813). Further, there was an issue due to mixed use of pure python and C++ code with name conflicts. This has been resolved so that both python and C++ code can be imported just find now.
This commit is contained in:
Emily Boudreaux
2025-11-03 14:26:39 -05:00
parent 2a8b6c0ba0
commit 4c064445c1
50 changed files with 329 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
build-python/meson.build
View File

@@ -1,8 +1,8 @@
# --- Python Extension Setup ---
py_installation = import('python').find_installation('python3')
py_installation = import('python').find_installation('python3', pure: false)
py_mod = py_installation.extension_module(
'fourdst', # Name of the generated .so/.pyd file (without extension)
'_phys', # Name of the generated .so/.pyd file (without extension)
sources: [
meson.project_source_root() + '/src-pybind/bindings.cpp',
meson.project_source_root() + '/src-pybind/composition/bindings.cpp',
@@ -17,97 +17,99 @@ py_mod = py_installation.extension_module(
],
cpp_args : ['-UNDEBUG'],
install : true,
subdir: 'fourdst',
)
py_installation.install_sources(
meson.project_source_root() + '/fourdst/__init__.py',
meson.project_source_root() + '/src-pybind/fourdst/__init__.py',
subdir: 'fourdst',
)
py_installation.install_sources(
files(
meson.project_source_root() + '/fourdst/cli/__init__.py',
meson.project_source_root() + '/fourdst/cli/main.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/__init__.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/main.py',
),
subdir: 'fourdst/cli',
)
py_installation.install_sources(
files(
meson.project_source_root() + '/fourdst/cli/templates/meson.build.in',
meson.project_source_root() + '/fourdst/cli/templates/plugin.cpp.in',
meson.project_source_root() + '/src-pybind/fourdst/cli/templates/meson.build.in',
meson.project_source_root() + '/src-pybind/fourdst/cli/templates/plugin.cpp.in',
),
subdir: 'fourdst/cli/templates',
)
py_installation.install_sources(
files(
meson.project_source_root() + '/fourdst/cli/bundle/__init__.py',
meson.project_source_root() + '/fourdst/cli/bundle/create.py',
meson.project_source_root() + '/fourdst/cli/bundle/fill.py',
meson.project_source_root() + '/fourdst/cli/bundle/inspect.py',
meson.project_source_root() + '/fourdst/cli/bundle/sign.py',
meson.project_source_root() + '/fourdst/cli/bundle/clear.py',
meson.project_source_root() + '/fourdst/cli/bundle/diff.py',
meson.project_source_root() + '/fourdst/cli/bundle/validate.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/bundle/__init__.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/bundle/create.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/bundle/fill.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/bundle/inspect.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/bundle/sign.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/bundle/clear.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/bundle/diff.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/bundle/validate.py',
),
subdir: 'fourdst/cli/bundle'
)
py_installation.install_sources(
files(
meson.project_source_root() + '/fourdst/cli/cache/__init__.py',
meson.project_source_root() + '/fourdst/cli/cache/clear.py'
meson.project_source_root() + '/src-pybind/fourdst/cli/cache/__init__.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/cache/clear.py'
),
subdir: 'fourdst/cli/cache'
)
py_installation.install_sources(
files(
meson.project_source_root() + '/fourdst/cli/common/__init__.py',
meson.project_source_root() + '/fourdst/cli/common/config.py',
meson.project_source_root() + '/fourdst/cli/common/templates.py',
meson.project_source_root() + '/fourdst/cli/common/utils.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/common/__init__.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/common/config.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/common/templates.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/common/utils.py',
),
subdir: 'fourdst/cli/common'
)
py_installation.install_sources(
files(
meson.project_source_root() + '/fourdst/cli/keys/__init__.py',
meson.project_source_root() + '/fourdst/cli/keys/generate.py',
meson.project_source_root() + '/fourdst/cli/keys/sync.py',
meson.project_source_root() + '/fourdst/cli/keys/add.py',
meson.project_source_root() + '/fourdst/cli/keys/list.py',
meson.project_source_root() + '/fourdst/cli/keys/remove.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/keys/__init__.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/keys/generate.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/keys/sync.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/keys/add.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/keys/list.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/keys/remove.py',
),
subdir: 'fourdst/cli/keys'
)
py_installation.install_sources(
files(
meson.project_source_root() + '/fourdst/cli/keys/remote/__init__.py',
meson.project_source_root() + '/fourdst/cli/keys/remote/add.py',
meson.project_source_root() + '/fourdst/cli/keys/remote/list.py',
meson.project_source_root() + '/fourdst/cli/keys/remote/remove.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/keys/remote/__init__.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/keys/remote/add.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/keys/remote/list.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/keys/remote/remove.py',
),
subdir: 'fourdst/cli/keys/remote'
)
py_installation.install_sources(
files(
meson.project_source_root() + '/fourdst/cli/plugin/__init__.py',
meson.project_source_root() + '/fourdst/cli/plugin/init.py',
meson.project_source_root() + '/fourdst/cli/plugin/pack.py',
meson.project_source_root() + '/fourdst/cli/plugin/extract.py',
meson.project_source_root() + '/fourdst/cli/plugin/diff.py',
meson.project_source_root() + '/fourdst/cli/plugin/validate.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/plugin/__init__.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/plugin/init.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/plugin/pack.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/plugin/extract.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/plugin/diff.py',
meson.project_source_root() + '/src-pybind/fourdst/cli/plugin/validate.py',
),
subdir: 'fourdst/cli/plugin'
)
py_installation.install_sources(
files(
meson.project_source_root() + '/fourdst/core/__init__.py',
meson.project_source_root() + '/fourdst/core/build.py',
meson.project_source_root() + '/fourdst/core/bundle.py',
meson.project_source_root() + '/fourdst/core/config.py',
meson.project_source_root() + '/fourdst/core/platform.py',
meson.project_source_root() + '/fourdst/core/utils.py',
meson.project_source_root() + '/fourdst/core/keys.py',
meson.project_source_root() + '/fourdst/core/plugin.py',
meson.project_source_root() + '/src-pybind/fourdst/core/__init__.py',
meson.project_source_root() + '/src-pybind/fourdst/core/build.py',
meson.project_source_root() + '/src-pybind/fourdst/core/bundle.py',
meson.project_source_root() + '/src-pybind/fourdst/core/config.py',
meson.project_source_root() + '/src-pybind/fourdst/core/platform.py',
meson.project_source_root() + '/src-pybind/fourdst/core/utils.py',
meson.project_source_root() + '/src-pybind/fourdst/core/keys.py',
meson.project_source_root() + '/src-pybind/fourdst/core/plugin.py',
),
subdir: 'fourdst/core'
)
@@ -117,4 +119,4 @@ py_installation.install_sources(
meson.project_source_root() + '/electron/bridge.py',
),
subdir: 'fourdst/electron'
)
)