From 0ccb86be69f46539237a888162e25e6f4ada4505 Mon Sep 17 00:00:00 2001 From: Andrew Sazonov Date: Thu, 25 Jul 2024 13:55:26 +0200 Subject: [PATCH] try adding custom rpaths --- pybuild.py | 4 +++- pybuild.toml | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pybuild.py b/pybuild.py index 2feab9d..04b9536 100644 --- a/pybuild.py +++ b/pybuild.py @@ -281,6 +281,8 @@ def _compile_obj_script_line(src_path: str, return cmd def _compile_pycfml_shared_obj_or_dynamic_lib_script_line(): + rpaths = '-Wl,-rpath,/opt/homebrew/opt/python@3.11/Frameworks/Python.framework/Versions/3.11/lib/python3.11/config-3.11-darwin -Wl,-rpath,/opt/homebrew/opt/python@3.11/Frameworks/Python.framework/Versions/3.11/lib -Wl,-rpath,/opt/homebrew/opt/python@3.11/Frameworks/Python.framework/Versions/3.11' + src_name = CONFIG['pycfml']['src-name'] shared_lib_ext = CONFIG['build']['shared-lib-ext'][_platform()] cfml_lib_name = CONFIG['cfml']['static-lib-name'] @@ -297,7 +299,7 @@ def _compile_pycfml_shared_obj_or_dynamic_lib_script_line(): cmd = cmd.replace('{CFML_LIB_PATH}', cfml_lib_dist_path) cmd = cmd.replace('{CFML_LIB_NAME}', cfml_lib_name) cmd = cmd.replace('{IFPORT_LIB}', _ifport_lib()) - cmd = cmd.replace('{PYTHON_LIB}', _python_lib()) + cmd = cmd.replace('{PYTHON_LIB}', _python_lib() + ' ' + rpaths) return cmd def _compile_objs_script_lines(modules: str, diff --git a/pybuild.toml b/pybuild.toml index c2f161f..8d4d35b 100644 --- a/pybuild.toml +++ b/pybuild.toml @@ -23,7 +23,8 @@ dist-progs = 'dist/CFML/progs' # for test programs [cfml.git] url = 'https://code.ill.fr/scientific-software/crysfml2008.git' -branch = 'powder_mod_fix' +#branch = 'powder_mod_fix' +branch = 'master' [cfml.scripts] pyapigen = 'repo/CFML/Scripts/PythonAPI/apigen.py'