diff options
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/__init__.py | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/rpm.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py index 8986d7a..085b4dd 100644 --- a/mesonbuild/modules/__init__.py +++ b/mesonbuild/modules/__init__.py @@ -1,5 +1,6 @@ from .. import build from .. import dependencies +from ..mesonlib import MesonException _found_programs = {} diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 9b606f3..3a991e9 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -696,7 +696,7 @@ can not be used with the current version of glib-compiled-resources, due to args += self._unpack_args('--ignore-headers=', 'ignore_headers', kwargs) args += self._unpack_args('--installdir=', 'install_dir', kwargs, state) args += self._get_build_args(kwargs, state) - res = [build.RunTarget(targetname, command[0], command[1:] + sargs, [], state.subdir)] + res = [build.RunTarget(targetname, command[0], command[1:] + args, [], state.subdir)] if kwargs.get('install', True): res.append(build.InstallScript(command, args)) return res diff --git a/mesonbuild/modules/rpm.py b/mesonbuild/modules/rpm.py index a0f79aa..e3c45c0 100644 --- a/mesonbuild/modules/rpm.py +++ b/mesonbuild/modules/rpm.py @@ -103,7 +103,7 @@ class RPMModule: mlog.bold('dnf provides %s' % lib.fullpath)) for prog in state.environment.coredata.ext_progs.values(): if not prog.found(): - fn.write('BuildRequires: %{_bindir}/%s # FIXME\n' % + fn.write('BuildRequires: %%{_bindir}/%s # FIXME\n' % prog.get_name()) else: fn.write('BuildRequires: %s\n' % ' '.join(prog.fullpath)) |