External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-05 01:22:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: Don't overwrite includedir

Browse Source 
The current implementation of the workaround for yajl's broken
pkg-config file accidentally overwrites the value of includedir
that is later used by the installation process. Rename the
local variable to avoid this issue.

Fixes: c97075e1e4
Closes: https://gitlab.com/libvirt/libvirt/-/issues/271
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Andrea Bolognani 2022-02-01 18:56:26 +01:00
parent 7714034ecd
commit 9f2d3cb472
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -1325,18 +1325,18 @@ if yajl_dep.found()
#
# [1] https://github.com/Homebrew/homebrew-core/pull/74516
if host_machine.system() != 'linux'
includedir = yajl_dep.get_pkgconfig_variable('includedir')
if includedir.contains('include/yajl')
yajl_includedir = yajl_dep.get_pkgconfig_variable('includedir')
if yajl_includedir.contains('include/yajl')
rc = run_command(
'python3', '-c',
'print("@0@".replace("@1@", "@2@"))'.format(
includedir, 'include/yajl', 'include',
yajl_includedir, 'include/yajl', 'include',
),
check: true,
)
includedir = rc.stdout().strip()
yajl_includedir = rc.stdout().strip()
yajl_dep = declare_dependency(
compile_args: [ '-I' + includedir ],
compile_args: [ '-I' + yajl_includedir ],
dependencies: [ yajl_dep ],
)
endif