diff options
| author |  Lionel Orry <lionel.orry@gmail.com> | 2018-10-11 11:57:53 +0200 |
|---|---|---|
| committer |  Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2019-02-06 17:21:28 +0100 |
| commit | be0bb26f29238f9c3210e21dd456f09e0d7b63bd (patch) | |
| tree | 239da4632dd61d4040cb45a8048654237ba0b3e7 | |
| parent | 0496a6a842e858c71760eb63833436fe9c044a6b (diff) | |
| download | buildroot-be0bb26f29238f9c3210e21dd456f09e0d7b63bd.tar.gz buildroot-be0bb26f29238f9c3210e21dd456f09e0d7b63bd.tar.bz2 | |
package/pkg-meson: <pkg>_SUBDIR cleanup
No functional change is brought by this modification.
This patch:
* removes a redundant <pkg>_SRCDIR declaration (already defined in
pkg-generic.mk)
* documents the usage of <pkg>_SUBDIR in the meson-specific section of
the manual.
Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
| -rw-r--r-- | docs/manual/adding-packages-meson.txt | 6 | ||||
| -rw-r--r-- | package/pkg-meson.mk | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/manual/adding-packages-meson.txt b/docs/manual/adding-packages-meson.txt index 549319b192..30c338f486 100644 --- a/docs/manual/adding-packages-meson.txt +++ b/docs/manual/adding-packages-meson.txt @@ -85,6 +85,12 @@ A few additional variables, specific to the Meson infrastructure, can also be defined. Many of them are only useful in very specific cases, typical packages will therefore only use a few of them. +* +FOO_SUBDIR+ may contain the name of a subdirectory inside the + package that contains the main meson.build file. This is useful, + if for example, the main meson.build file is not at the root of + the tree extracted by the tarball. If +HOST_FOO_SUBDIR+ is not + specified, it defaults to +FOO_SUBDIR+. + * +FOO_CONF_ENV+, to specify additional environment variables to pass to +meson+ for the configuration step. By default, empty. diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 256e5645e4..a637299476 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -48,7 +48,6 @@ define inner-meson-package $(2)_CONF_ENV ?= $(2)_CONF_OPTS ?= $(2)_NINJA_ENV ?= -$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR) # # Configure step. Only define it if not already defined by the package |