diff options
author | Stéphane Cerveau <scerveau@collabora.com> | 2020-01-14 11:11:52 +0100 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2020-01-22 15:42:13 -0500 |
commit | 958df63dac810246e84c2b8eaa32d22d19ace0ef (patch) | |
tree | 3ca9044222feb643f62dabdf061992e70c68018a /docs/markdown | |
parent | c5c0c467fedb909c1cfe7547abe477fdabb5526c (diff) | |
download | meson-958df63dac810246e84c2b8eaa32d22d19ace0ef.zip meson-958df63dac810246e84c2b8eaa32d22d19ace0ef.tar.gz meson-958df63dac810246e84c2b8eaa32d22d19ace0ef.tar.bz2 |
envconfig: add pkg_config_libdir property
In order to unify the use of sysroot in the cross-file,
the pkg_config_libdir can now be passed directly in the file.
Diffstat (limited to 'docs/markdown')
-rw-r--r-- | docs/markdown/Cross-compilation.md | 5 | ||||
-rw-r--r-- | docs/markdown/snippets/pkg_config_libdir.md | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/docs/markdown/Cross-compilation.md b/docs/markdown/Cross-compilation.md index b3cdc81..6894c0d 100644 --- a/docs/markdown/Cross-compilation.md +++ b/docs/markdown/Cross-compilation.md @@ -138,6 +138,7 @@ has_function_printf = true c_args = ['-DCROSS=1', '-DSOMETHING=3'] c_link_args = ['-some_link_arg'] sys_root = '/some/path' +pkg_config_libdir = '/some/path/lib/pkgconfig' ``` In most cases you don't need the size and alignment settings, Meson @@ -155,6 +156,10 @@ internally by Meson to set the PKG_CONFIG_SYSROOT_DIR environment variable for pkg-config. If this is unset the host system is assumed to share a root with the build system. +*Since 0.54.0* The pkg_config_libdir property may point to a list of path used +internally by Meson to set the PKG_CONFIG_LIBDIR environment variable for pkg-config. +This prevents pkg-config from searching cross dependencies in system directories. + One important thing to note, if you did not define an `exe_wrapper` in the previous section, is that Meson will make a best-effort guess at whether it can run the generated binaries on the build machine. It diff --git a/docs/markdown/snippets/pkg_config_libdir.md b/docs/markdown/snippets/pkg_config_libdir.md new file mode 100644 index 0000000..691f8c5 --- /dev/null +++ b/docs/markdown/snippets/pkg_config_libdir.md @@ -0,0 +1,3 @@ +## Added 'pkg_config_libdir' property +Allows to define a list of folders used by pkg-config for a cross build +and avoid a system directories use. |