diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-04-17 10:36:21 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-06-26 23:28:33 +0300 |
| commit | e182dba61feb5b6872154e245014c58d99aa39d8 (patch) | |
| tree | 9398604c60386e6c4019fe4e72f33b9901f17b49 /docs/markdown | |
| parent | 41a0292993f6caa00fd7dea3bfe922220cd2d4e1 (diff) | |
| download | meson-e182dba61feb5b6872154e245014c58d99aa39d8.zip meson-e182dba61feb5b6872154e245014c58d99aa39d8.tar.gz meson-e182dba61feb5b6872154e245014c58d99aa39d8.tar.bz2 | |
dependencies/base: Set PKG_CONFIG_SYSROOT_DIR from cross file
In some cases it may be necessary to set PKG_CONFIG_SYSROOT_DIR, like
when you've mounted a host architecture system in an arbitrary path.
Meson will now check the cross files for a [properties]:sys_root
variable and set the PKG_CONFIG_SYSROOT_DIR environment variable based
on that variable.
Fixes #3801
Fixes #4057
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Cross-compilation.md | 7 | ||||
| -rw-r--r-- | docs/markdown/snippets/pkg_config_enhancements.md | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/docs/markdown/Cross-compilation.md b/docs/markdown/Cross-compilation.md index 36620eb..f200bbb 100644 --- a/docs/markdown/Cross-compilation.md +++ b/docs/markdown/Cross-compilation.md @@ -120,6 +120,7 @@ has_function_printf = true c_args = ['-DCROSS=1', '-DSOMETHING=3'] c_link_args = ['-some_link_arg'] +sys_root = '/some/path' ``` In most cases you don't need the size and alignment settings, Meson @@ -131,6 +132,12 @@ cross compilation you can set them with `[langname]_args = [args]`. Just remember to specify the args as an array and not as a single string (i.e. not as `'-DCROSS=1 -DSOMETHING=3'`). +*Since 0.52.0* The `sys_root` property may point to the root of the host +system path (the system that will run the compiled binaries). This is used +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. + 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_enhancements.md b/docs/markdown/snippets/pkg_config_enhancements.md new file mode 100644 index 0000000..1d63c8f --- /dev/null +++ b/docs/markdown/snippets/pkg_config_enhancements.md @@ -0,0 +1,5 @@ +## Enhancements to the pkg_config_path argument + +Setting sys_root in the [properties] section of your cross file will now set +PKG_CONFIG_SYSROOT_DIR automatically for host system dependencies when +cross compiling.
\ No newline at end of file |