From efb774bbda73ed89a97501e1d6b13d1fbd0261ef Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 26 Dec 2018 09:52:28 +0100 Subject: [PATCH] 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" Cc: Eric Le Bihan Cc: James Hilliard Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-meson.txt | 3 +++ package/pkg-meson.mk | 4 ++-- 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 -- 2.30.2