rename %(rpath)s template to %(rpath_enabled)s

Author: boegel

easybuild/framework/easyconfig/templates.py

@@ -101,7 +101,7 @@
     ('cuda_sm_space_sep', "Space-separated list of sm_* values that correspond with CUDA compute capabilities"),
     ('mpi_cmd_prefix', "Prefix command for running MPI programs (with default number of ranks)"),
     # can't be a boolean (True/False), must be a string value since it's a string template
-    ('rpath', "String value indicating whether or not RPATH linking is used ('true' or 'false')"),
+    ('rpath_enabled', "String value indicating whether or not RPATH linking is used ('true' or 'false')"),
     ('software_commit', "Git commit id to use for the software as specified by --software-commit command line option"),
     ('sysroot', "Location root directory of system, prefix for standard paths like /usr/lib and /usr/include"
      "as specified by the --sysroot configuration option"),
@@ -211,7 +211,7 @@ def template_constant_dict(config, ignore=None, skip_lower=None, toolchain=None)
     template_values['arch'] = platform.uname()[4]
 
     # set 'rpath' template based on 'rpath' configuration option, using empty string as fallback
-    template_values['rpath'] = 'true' if build_option('rpath') else 'false'
+    template_values['rpath_enabled'] = 'true' if build_option('rpath') else 'false'
 
     # set 'sysroot' template based on 'sysroot' configuration option, using empty string as fallback
     template_values['sysroot'] = build_option('sysroot') or ''

test/framework/easyconfig.py

@@ -1430,7 +1430,7 @@ def test_rpath_template(self):
 
         test_ec = os.path.join(self.test_prefix, 'test.eb')
         test_ec_txt = read_file(toy_ec)
-        test_ec_txt += "configopts = '--with-rpath=%(rpath)s'"
+        test_ec_txt += "configopts = '--with-rpath=%(rpath_enabled)s'"
         write_file(test_ec, test_ec_txt)
 
         ec = EasyConfig(test_ec)
@@ -3400,7 +3400,7 @@ def test_template_constant_dict(self):
             'nameletter': 'g',
             'nameletterlower': 'g',
             'parallel': None,
-            'rpath': rpath,
+            'rpath_enabled': rpath,
             'software_commit': '',
             'sysroot': '',
             'toolchain_name': 'foss',
@@ -3484,7 +3484,7 @@ def test_template_constant_dict(self):
             'pyminver': '7',
             'pyshortver': '3.7',
             'pyver': '3.7.2',
-            'rpath': rpath,
+            'rpath_enabled': rpath,
             'software_commit': '',
             'sysroot': '',
             'version': '0.01',
@@ -3551,7 +3551,7 @@ def test_template_constant_dict(self):
             'namelower': 'foo',
             'nameletter': 'f',
             'nameletterlower': 'f',
-            'rpath': rpath,
+            'rpath_enabled': rpath,
             'software_commit': '',
             'sysroot': '',
             'version': '1.2.3',