From cedd5ab74a422b2cbaa026d47204a55ee4be540b Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Sat, 3 Feb 2024 19:47:46 +0000 Subject: [PATCH 1/3] enable rpath by default --- easybuild/tools/options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/tools/options.py b/easybuild/tools/options.py index be5cf94f75..cb6ec2022f 100644 --- a/easybuild/tools/options.py +++ b/easybuild/tools/options.py @@ -489,7 +489,7 @@ def override_options(self): 'required-linked-shared-libs': ("Comma-separated list of shared libraries (names, file names, or paths) " "which must be linked in all installed binaries/libraries", 'strlist', 'extend', None), - 'rpath': ("Enable use of RPATH for linking with libraries", None, 'store_true', False), + 'rpath': ("Enable use of RPATH for linking with libraries", None, 'store_true', True), 'rpath-filter': ("List of regex patterns to use for filtering out RPATH paths", 'strlist', 'store', None), 'rpath-override-dirs': ("Path(s) to be prepended when linking with RPATH (string, colon-separated)", None, 'store', None), From 54b36337a187bf1f6605216d82d2ee455fee5dbc Mon Sep 17 00:00:00 2001 From: Simon Branford <4967+branfosj@users.noreply.github.com> Date: Sun, 4 Feb 2024 13:44:39 +0000 Subject: [PATCH 2/3] disable rpath in two tests --- test/framework/options.py | 1 + test/framework/toolchain.py | 1 + 2 files changed, 2 insertions(+) diff --git a/test/framework/options.py b/test/framework/options.py index ca8a582365..5d87695661 100644 --- a/test/framework/options.py +++ b/test/framework/options.py @@ -4121,6 +4121,7 @@ def test_extended_dry_run(self): '--buildpath=%s' % self.test_buildpath, '--installpath=%s' % self.test_installpath, '--debug', + '--disable-rpath', ] msg_regexs = [ diff --git a/test/framework/toolchain.py b/test/framework/toolchain.py index 1c8c1771a6..918b344dcf 100644 --- a/test/framework/toolchain.py +++ b/test/framework/toolchain.py @@ -2269,6 +2269,7 @@ def test_compiler_cache(self): "--force", "--debug", "--disable-cleanup-tmpdir", + "--disable-rpath", ] ccache = which('ccache') From 612b1c0448db922adaed55c1f14ebb45f8bff2a8 Mon Sep 17 00:00:00 2001 From: Simon Branford <4967+branfosj@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:29:51 +0000 Subject: [PATCH 3/3] rpath off on mac --- easybuild/tools/options.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/easybuild/tools/options.py b/easybuild/tools/options.py index cb6ec2022f..197514eb07 100644 --- a/easybuild/tools/options.py +++ b/easybuild/tools/options.py @@ -103,8 +103,8 @@ from easybuild.tools.toolchain.compiler import DEFAULT_OPT_LEVEL, OPTARCH_MAP_CHAR, OPTARCH_SEP, Compiler from easybuild.tools.toolchain.toolchain import SYSTEM_TOOLCHAIN_NAME from easybuild.tools.repository.repository import avail_repositories -from easybuild.tools.systemtools import UNKNOWN, check_python_version, get_cpu_architecture, get_cpu_family -from easybuild.tools.systemtools import get_cpu_features, get_gpu_info, get_system_info +from easybuild.tools.systemtools import DARWIN, UNKNOWN, check_python_version, get_cpu_architecture, get_cpu_family +from easybuild.tools.systemtools import get_cpu_features, get_gpu_info, get_os_type, get_system_info from easybuild.tools.version import this_is_easybuild @@ -131,6 +131,8 @@ def terminal_supports_colors(stream): DEFAULT_LIST_PR_ORDER = GITHUB_PR_ORDER_CREATED DEFAULT_LIST_PR_DIREC = GITHUB_PR_DIRECTION_DESC +RPATH_DEFAULT = False if get_os_type() == DARWIN else True + _log = fancylogger.getLogger('options', fname=False) @@ -489,7 +491,7 @@ def override_options(self): 'required-linked-shared-libs': ("Comma-separated list of shared libraries (names, file names, or paths) " "which must be linked in all installed binaries/libraries", 'strlist', 'extend', None), - 'rpath': ("Enable use of RPATH for linking with libraries", None, 'store_true', True), + 'rpath': ("Enable use of RPATH for linking with libraries", None, 'store_true', RPATH_DEFAULT), 'rpath-filter': ("List of regex patterns to use for filtering out RPATH paths", 'strlist', 'store', None), 'rpath-override-dirs': ("Path(s) to be prepended when linking with RPATH (string, colon-separated)", None, 'store', None),