diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-01-30 11:30:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-30 11:30:16 +0000 |
| commit | c67e0a8a6785ab5f139491786fa064905278d951 (patch) | |
| tree | 848cd21be5fbf4c8cedae03fa0f4f72f59b92f0a /docs/markdown | |
| parent | f0fbb31ccfa78ca1d7b7f9cedfbb090bf36d3e64 (diff) | |
| parent | ef7dfa97fc6f20d8793609fc086718399c08a85a (diff) | |
| download | meson-c67e0a8a6785ab5f139491786fa064905278d951.zip meson-c67e0a8a6785ab5f139491786fa064905278d951.tar.gz meson-c67e0a8a6785ab5f139491786fa064905278d951.tar.bz2 | |
Merge pull request #8264 from xclaesse/ep-misc
external_project: misc improvements
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/External-Project-module.md | 12 | ||||
| -rw-r--r-- | docs/markdown/snippets/external_project.md | 11 |
2 files changed, 20 insertions, 3 deletions
diff --git a/docs/markdown/External-Project-module.md b/docs/markdown/External-Project-module.md index 54b248f..e469024 100644 --- a/docs/markdown/External-Project-module.md +++ b/docs/markdown/External-Project-module.md @@ -54,8 +54,10 @@ build system. Usually in a `meson.build` file placed in the top directory of a subproject, but could be also in any subdir. Its first positional argument is the name of the configure script to be -executed (e.g. `configure` or `autogen.sh`), that file must be in the current -directory and executable. +executed (e.g. `configure`), that file must be in the current directory and +executable. Note that if a bootstrap script is required (e.g. `autogen.sh` when +building from git instead of tarball), it can be done using `run_command()` +before calling `add_project()` method. Keyword arguments: - `configure_options`: An array of strings to be passed as arguments to the @@ -63,7 +65,11 @@ Keyword arguments: them to the configure script: `@PREFIX@`, `@LIBDIR@` and `@INCLUDEDIR@`. Note that `libdir` and `includedir` paths are relative to `prefix` in Meson but some configure scripts requires absolute path, in that case they can be - passed as `'--libdir=@PREFIX@/@LIBDIR@'`. + passed as `'--libdir=@PREFIX@/@LIBDIR@'`. *Since 0.57.0* default arguments are + added in case some tags are not found in `configure_options`: + `'--prefix=@PREFIX@'`, `'--libdir=@PREFIX@/@LIBDIR@'`, and + `'--includedir=@PREFIX@/@INCLUDEDIR@'`. It was previously considered a fatal + error to not specify them. - `cross_configure_options`: Extra options appended to `configure_options` only when cross compiling. special tag `@HOST@` will be replaced by `'{}-{}-{}'.format(host_machine.cpu_family(), build_machine.system(), host_machine.system()`. diff --git a/docs/markdown/snippets/external_project.md b/docs/markdown/snippets/external_project.md new file mode 100644 index 0000000..b48dc35 --- /dev/null +++ b/docs/markdown/snippets/external_project.md @@ -0,0 +1,11 @@ +## `unstable_external_project` improvements + +- Default arguments are added to `add_project()` in case some tags are not found + in `configure_options`: `'--prefix=@PREFIX@'`, `'--libdir=@PREFIX@/@LIBDIR@'`, + and `'--includedir=@PREFIX@/@INCLUDEDIR@'`. It was previously considered a fatal + error to not specify them. +- When `verbose` keyword argument is not specified, or is false, command outputs + are written on file in `<builddir>/meson-logs/`. +- `LD` environment variable is not passed any more when running the configure + script. It caused issues because Meson uses CC as linker wrapper but autotools + expects to real linker (e.g. `/usr/bin/ld`). |