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...
pull/1356/head
Nirbheek Chauhan 8 years ago
parent 940b8a2e93
commit 2478bb144d
  1. 3
      mesonbuild/dependencies.py
  2. 3
      mesonbuild/interpreter.py
  3. 7
      mesonbuild/modules/rpm.py

@ -564,6 +564,9 @@ class ExternalLibrary(Dependency):
def found(self):
return self.is_found
def get_name(self):
return self.name
def get_link_args(self):
return self.link_args

@ -308,9 +308,6 @@ class ExternalLibraryHolder(InterpreterObject):
def found_method(self, args, kwargs):
return self.found()
def get_filename(self):
return self.held_object.fullpath
def get_name(self):
return self.held_object.name

@ -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' %

Loading…
Cancel
Save