diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-19 03:48:22 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-19 03:50:43 +0530 |
| commit | 2478bb144d69037250cd8d2e6e0a827a8582671f (patch) | |
| tree | 752ec5700a6998f06d38f065cdfd52d52bd5aa0d /mesonbuild/modules/rpm.py | |
| parent | 940b8a2e93a551f7ef4c20568061545f77d0a055 (diff) | |
| download | meson-2478bb144d69037250cd8d2e6e0a827a8582671f.zip meson-2478bb144d69037250cd8d2e6e0a827a8582671f.tar.gz meson-2478bb144d69037250cd8d2e6e0a827a8582671f.tar.bz2 | |
rpm: We no longer provide the full path to a library
Ever since we changed how we do library searching, the full path to the
library has not been available under `.fullpath`. This has been broken
for at least a year...
Diffstat (limited to 'mesonbuild/modules/rpm.py')
| -rw-r--r-- | mesonbuild/modules/rpm.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/modules/rpm.py b/mesonbuild/modules/rpm.py index b967863..bbfeaa0 100644 --- a/mesonbuild/modules/rpm.py +++ b/mesonbuild/modules/rpm.py @@ -98,11 +98,12 @@ 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' % |