diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-02-19 12:37:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-19 12:37:56 -0500 |
| commit | 0cf18eb3bc6f872324971610f92d54d63049b9c9 (patch) | |
| tree | 002840679e8cb2d179adb156c3c92f69bca3ae00 /mesonbuild/modules/rpm.py | |
| parent | aba099a4910c2e578c0aefbd20bda666b6a6856e (diff) | |
| parent | f23a4a8b27b2a2e46185869bb736b1ab843cdcf3 (diff) | |
| download | meson-0cf18eb3bc6f872324971610f92d54d63049b9c9.zip meson-0cf18eb3bc6f872324971610f92d54d63049b9c9.tar.gz meson-0cf18eb3bc6f872324971610f92d54d63049b9c9.tar.bz2 | |
Merge pull request #1356 from centricular/cross-platform-unit-tests
Run unit tests on more platforms, and more
Diffstat (limited to 'mesonbuild/modules/rpm.py')
| -rw-r--r-- | mesonbuild/modules/rpm.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mesonbuild/modules/rpm.py b/mesonbuild/modules/rpm.py index bd8a3c4..bbfeaa0 100644 --- a/mesonbuild/modules/rpm.py +++ b/mesonbuild/modules/rpm.py @@ -98,17 +98,18 @@ class RPMModule(ExtensionModule): for dep in state.environment.coredata.deps: fn.write('BuildRequires: pkgconfig(%s)\n' % dep[0]) for lib in state.environment.coredata.ext_libs.values(): - fn.write('BuildRequires: %s # FIXME\n' % lib.fullpath) - mlog.warning('replace', mlog.bold(lib.fullpath), 'with real package.', + name = lib.get_name() + fn.write('BuildRequires: {} # FIXME\n'.format(name)) + mlog.warning('replace', mlog.bold(name), 'with the real package.', 'You can use following command to find package which ' 'contains this lib:', - mlog.bold('dnf provides %s' % lib.fullpath)) + mlog.bold("dnf provides '*/lib{}.so".format(name)) for prog in state.environment.coredata.ext_progs.values(): if not prog.found(): fn.write('BuildRequires: %%{_bindir}/%s # FIXME\n' % prog.get_name()) else: - fn.write('BuildRequires: %s\n' % ' '.join(prog.fullpath)) + fn.write('BuildRequires: {}\n'.format(prog.get_path())) fn.write('BuildRequires: meson\n') fn.write('\n') fn.write('%description\n') |