diff options
Diffstat (limited to 'devbot')
| -rw-r--r-- | devbot/build.py | 6 | ||||
| -rw-r--r-- | devbot/config.py | 1 | ||||
| -rw-r--r-- | devbot/environ.py | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/devbot/build.py b/devbot/build.py index 8740927..98cf368 100644 --- a/devbot/build.py +++ b/devbot/build.py @@ -97,6 +97,9 @@ def _pull_module(module): return True +def _eval_option(option): + return eval(option, {"prefix": config.prefix_dir}) + def _build_autotools(module, log): makefile_path = os.path.join(module.get_build_dir(), "Makefile") @@ -108,6 +111,9 @@ def _build_autotools(module, log): "--libdir", config.lib_dir] args.extend(module.options) + for option in module.options_evaluated: + args.append(_eval_option(option)) + command.run(args, log) jobs = multiprocessing.cpu_count() * 2 diff --git a/devbot/config.py b/devbot/config.py index 4c04a56..284e9a8 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -36,6 +36,7 @@ class Module: self.tag = info.get("tag", None) self.auto_install = info.get("auto-install", False) self.options = info.get("options", []) + self.options_evaluated = info.get("options_evaluated", []) if get_pref("BUILD_IN_SOURCE"): self.out_of_source = False diff --git a/devbot/environ.py b/devbot/environ.py index 2107792..d600cca 100644 --- a/devbot/environ.py +++ b/devbot/environ.py @@ -47,7 +47,8 @@ def _setup_variables(): plat_specific=True)) _add_path("PYTHONPATH", os.path.dirname(config.devbot_dir)) - + _add_path("XDG_DATA_HOME", + os.path.join(config.home_dir, "data")) _add_path("XDG_DATA_DIRS", "/usr/share") _add_path("XDG_DATA_DIRS", config.share_dir) |