Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pkgconfig: Add missing 'URL' and 'Conflicts' entries

This commit is contained in:
Guillaume Poirier-Morency 2016-10-07 09:10:56 -04:00
parent a33c5c50f1
commit 3090419181
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mesonbuild/modules/pkgconfig.py
View File

@ -37,8 +37,9 @@ class PkgConfigModule:
mlog.log(mlog.red('WARNING:'), msg.format(l.name, 'name_prefix', l.name, pcfile)) mlog.log(mlog.red('WARNING:'), msg.format(l.name, 'name_prefix', l.name, pcfile))
return l.name return l.name
def generate_pkgconfig_file(self, state, libraries, subdirs, name, description, version, pcfile, def generate_pkgconfig_file(self, state, libraries, subdirs, name, description,
pub_reqs, priv_reqs, priv_libs): url, version, pcfile, pub_reqs, priv_reqs,
conflicts, priv_libs):
coredata = state.environment.get_coredata() coredata = state.environment.get_coredata()
outdir = state.environment.scratch_dir outdir = state.environment.scratch_dir
fname = os.path.join(outdir, pcfile) fname = os.path.join(outdir, pcfile)
@ -51,6 +52,8 @@ class PkgConfigModule:
ofile.write('Name: %s\n' % name) ofile.write('Name: %s\n' % name)
if len(description) > 0: if len(description) > 0:
ofile.write('Description: %s\n' % description) ofile.write('Description: %s\n' % description)
if len(url) > 0:
ofile.write('URL: %s\n' % url)
if len(version) > 0: if len(version) > 0:
ofile.write('Version: %s\n' % version) ofile.write('Version: %s\n' % version)
if len(pub_reqs) > 0: if len(pub_reqs) > 0:
@ -58,6 +61,8 @@ class PkgConfigModule:
if len(priv_reqs) > 0: if len(priv_reqs) > 0:
ofile.write( ofile.write(
'Requires.private: {}\n'.format(' '.join(priv_reqs))) 'Requires.private: {}\n'.format(' '.join(priv_reqs)))
if len(conflicts) > 0:
ofile.write('Conflicts: {}\n'.format(' '.join(conflicts)))
if len(priv_libs) > 0: if len(priv_libs) > 0:
ofile.write( ofile.write(
'Libraries.private: {}\n'.format(' '.join(priv_libs))) 'Libraries.private: {}\n'.format(' '.join(priv_libs)))
@ -110,8 +115,12 @@ class PkgConfigModule:
description = kwargs.get('description', None) description = kwargs.get('description', None)
if not isinstance(description, str): if not isinstance(description, str):
raise mesonlib.MesonException('Description is not a string.') raise mesonlib.MesonException('Description is not a string.')
url = kwargs.get('url', '')
if not isinstance(url, str):
raise mesonlib.MesonException('URL is not a string.')
pub_reqs = mesonlib.stringlistify(kwargs.get('requires', [])) pub_reqs = mesonlib.stringlistify(kwargs.get('requires', []))
priv_reqs = mesonlib.stringlistify(kwargs.get('requires_private', [])) priv_reqs = mesonlib.stringlistify(kwargs.get('requires_private', []))
conflicts = mesonlib.stringlistify(kwargs.get('conflicts', []))
priv_libs = mesonlib.stringlistify(kwargs.get('libraries_private', [])) priv_libs = mesonlib.stringlistify(kwargs.get('libraries_private', []))
pcfile = filebase + '.pc' pcfile = filebase + '.pc'
pkgroot = kwargs.get('install_dir',None) pkgroot = kwargs.get('install_dir',None)
@ -119,8 +128,9 @@ class PkgConfigModule:
pkgroot = os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'pkgconfig') pkgroot = os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'pkgconfig')
if not isinstance(pkgroot, str): if not isinstance(pkgroot, str):
raise mesonlib.MesonException('Install_dir must be a string.') raise mesonlib.MesonException('Install_dir must be a string.')
self.generate_pkgconfig_file(state, libs, subdirs, name, description, version, pcfile, self.generate_pkgconfig_file(state, libs, subdirs, name, description, url,
pub_reqs, priv_reqs, priv_libs) version, pcfile, pub_reqs, priv_reqs,
conflicts, priv_libs)
return build.Data(False, state.environment.get_scratch_dir(), [pcfile], pkgroot) return build.Data(False, state.environment.get_scratch_dir(), [pcfile], pkgroot)
def initialize(): def initialize():