[v2,09/13] package/pkg-kconfig: handle KCONFIG_DEPENDENCIES with per-package directories

Message ID 20190314094024.1961-10-anaumann@ultratronik.de
State New
Headers show
Series
  • ppsh compatible Qt5 / generic qmake target install
Related show

Commit Message

Andreas Naumann March 14, 2019, 9:40 a.m.
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

The pkg-kconfig infrastructure hijacks the regular chain of build
steps to insert its own step to prepare the configuration of kconfig
packages. This additional step may have dependencies of its own, such
as host-flex, host-bison or toolchain.

In the context of per-package directory support, those dependencies
must be copied to the per-package directory of the current package
prior to doing the config preparation. This commit implements this
logic by adding a call to prepare-per-package-directory at the right
spot.

Reported-by: Andreas Naumann <anaumann@ultratronik.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
 package/pkg-kconfig.mk | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
index ce11e14824..5a29490473 100644
--- a/package/pkg-kconfig.mk
+++ b/package/pkg-kconfig.mk
@@ -117,6 +117,7 @@  endef
 # Since the file could be a defconfig file it needs to be expanded to a
 # full .config first.
 $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
+	$$(call prepare-per-package-directory,$$($(2)_KCONFIG_DEPENDENCIES))
 	$$(Q)$$(if $$($(2)_KCONFIG_DEFCONFIG), \
 		$$($(2)_KCONFIG_MAKE) $$($(2)_KCONFIG_DEFCONFIG), \
 		$$(INSTALL) -m 0644 -D $$($(2)_KCONFIG_FILE) $$(@))