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

pkgconfig: Fix broken paths in -uninstalled.pc on Windows 

Fixes: #8668
This commit is contained in:
Xavier Claessens 2021-04-17 09:47:31 -04:00 committed by Jussi Pakkanen
parent 68dda2a241
commit 8f6ad8e52e
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mesonbuild/modules/pkgconfig.py
View File

@ -307,17 +307,12 @@ class PkgConfigModule(ExtensionModule):
return value.replace(' ', r'\ ') return value.replace(' ', r'\ ')
def _make_relative(self, prefix, subdir): def _make_relative(self, prefix, subdir):
if isinstance(prefix, PurePath): prefix = PurePath(prefix)
prefix = prefix.as_posix() subdir = PurePath(subdir)
if isinstance(subdir, PurePath):
subdir = subdir.as_posix()
try: try:
if os.path.commonpath([prefix, subdir]) == prefix: return subdir.relative_to(prefix).as_posix()
skip = len(prefix) + 1
subdir = subdir[skip:]
except ValueError: except ValueError:
pass return subdir.as_posix()
return subdir
def generate_pkgconfig_file(self, state, deps, subdirs, name, description, def generate_pkgconfig_file(self, state, deps, subdirs, name, description,
url, version, pcfile, conflicts, variables, url, version, pcfile, conflicts, variables,
@ -417,8 +412,8 @@ class PkgConfigModule(ExtensionModule):
def generate_uninstalled_cflags(libs): def generate_uninstalled_cflags(libs):
for d in get_uninstalled_include_dirs(libs): for d in get_uninstalled_include_dirs(libs):
for basedir in ['${prefix}', '${srcdir}']: for basedir in ['${prefix}', '${srcdir}']:
path = os.path.join(basedir, d) path = PurePath(basedir, d)
yield '-I%s' % self._escape(path) yield '-I%s' % self._escape(path.as_posix())
if len(deps.pub_libs) > 0: if len(deps.pub_libs) > 0:
ofile.write('Libs: {}\n'.format(' '.join(generate_libs_flags(deps.pub_libs)))) ofile.write('Libs: {}\n'.format(' '.join(generate_libs_flags(deps.pub_libs))))