Skip to content
Snippets Groups Projects
Commit 791c4833 authored by Mehdi Sabwat's avatar Mehdi Sabwat Committed by Hugo Beauzée-Luyssen
Browse files

contrib: set pkg_config_libdir in meson crossfile

pkg_config_libdir is not a builtin option, to use
it we need to define it either in the meson.build of the
project or in the crossfile.

This used to fail silently, but since PR#8974 (meson 0.60.0.rc1)
it is a fatal error.
parent e56d9673
No related branches found
No related tags found
1 merge request!965contrib: set pkg_config_libdir in meson crossfile
Pipeline #164912 passed with stage
in 26 minutes and 15 seconds
......@@ -34,6 +34,7 @@ if os.environ.get('HOST_SYSTEM') == 'darwin':
_add_environ_val('ar', 'AR')
_add_environ_val('strip', 'STRIP')
_add_environ_val('pkgconfig', 'PKG_CONFIG')
_add_environ_val('pkg_config_libdir', 'PKG_CONFIG_LIBDIR')
_add_environ_val('windres', 'WINDRES')
# Properties section
......
......@@ -431,8 +431,7 @@ ifdef HAVE_CROSS_COMPILE
MESONFLAGS += --cross-file $(abspath crossfile.meson)
MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" \
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
meson -Dpkg_config_libdir="$(PKG_CONFIG_LIBDIR)" \
-Dpkg_config_path="$(PKG_CONFIG_PATH)" \
meson -Dpkg_config_path="$(PKG_CONFIG_PATH)" \
$(MESONFLAGS)
else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment