aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2018-12-26 09:52:28 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-12-28 11:54:04 +0100
commitefb774bbda73ed89a97501e1d6b13d1fbd0261ef (patch)
tree1b0505922b99efc1098d6e76e09f7e04abaa2727
parentf3bacda0c0e0adb2ac7f515476f6bb83d1385130 (diff)
downloadbuildroot-efb774bbda73ed89a97501e1d6b13d1fbd0261ef.tar.gz
buildroot-efb774bbda73ed89a97501e1d6b13d1fbd0261ef.tar.bz2
package/pkg-meson: allow meson packages to specify custom build rules
Some packages may want to build only specific targets, instead of the default. So, allow them to provide FOO_NINJA_OPTS (not really options, but we just mimicked the naming we already have for autotools packages). Update the manual accordingly. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr> Cc: James Hilliard <james.hilliard1@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--docs/manual/adding-packages-meson.txt3
-rw-r--r--package/pkg-meson.mk4
2 files changed, 5 insertions, 2 deletions
diff --git a/docs/manual/adding-packages-meson.txt b/docs/manual/adding-packages-meson.txt
index c52fe10506..549319b192 100644
--- a/docs/manual/adding-packages-meson.txt
+++ b/docs/manual/adding-packages-meson.txt
@@ -94,3 +94,6 @@ will therefore only use a few of them.
* +FOO_NINJA_ENV+, to specify additional environment variables to pass to
+ninja+, meson companion tool in charge of the build operations. By default,
empty.
+
+* +FOO_NINJA_OPTS+, to specify a space-separated list of targets to build. By
+ default, empty, to build the default target(s).
diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk
index 507e686068..0588660dbf 100644
--- a/package/pkg-meson.mk
+++ b/package/pkg-meson.mk
@@ -103,12 +103,12 @@ ifndef $(2)_BUILD_CMDS
ifeq ($(4),target)
define $(2)_BUILD_CMDS
$$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \
- $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
+ $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
endef
else
define $(2)_BUILD_CMDS
$$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) \
- $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
+ $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_SRCDIR)/build
endef
endif
endif