Merge pull request #70 from ignatenkobrain/rpm

modules/rpm: workaround when ext_prog not found locally
pull/72/head
jpakkane 10 years ago
commit 85132e8948
  1. 1
      manual tests/5 rpm/meson.build
  2. 5
      modules/rpm.py

@ -2,6 +2,7 @@ project('test spec', 'c')
rpm = import('rpm')
dependency('zlib')
find_program('nonexistprog', required : false)
lib = shared_library('mesontest_shared', ['lib.c', 'lib.h'],
version : '0.1', soversion : '0',

@ -100,7 +100,10 @@ class RPMModule:
'You can use following command to find package which contains this lib:',
mlog.bold('dnf provides %s' % lib.fullpath))
for prog in state.environment.coredata.ext_progs.values():
fn.write('BuildRequires: %s\n' % ' '.join(prog.fullpath))
if not prog.found():
fn.write('BuildRequires: /usr/bin/%s # FIXME\n' % prog.get_name())
else:
fn.write('BuildRequires: %s\n' % ' '.join(prog.fullpath))
fn.write('BuildRequires: meson\n')
fn.write('\n')
fn.write('%description\n')

Loading…
Cancel
Save