From d88514c56f8369d896486581874efed5a461908b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Jul 2022 19:13:04 +0200 Subject: [PATCH] - auto-assign some dependencies --- package/meson/meson.mk | 2 +- package/pkg-utils.mk | 14 +++++++++++++- package/python-setuptools/python-setuptools.mk | 2 -- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/package/meson/meson.mk b/package/meson/meson.mk index c2aa607b..1db4cf9c 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -11,7 +11,7 @@ MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSI # ----------------------------------------------------------------------------- -HOST_MESON_DEPENDENCIES = host-ninja host-python3 host-python-setuptools +HOST_MESON_DEPENDENCIES = host-ninja HOST_MESON_BINARY = $(HOST_DIR)/bin/meson diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index dfa362b4..c60fc730 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -182,7 +182,7 @@ ifndef $(PKG)_NINJA_OPTS $(PKG)_NINJA_OPTS = endif -#kconfig +# kconfig ifeq ($(PKG_MODE),KCONFIG) ifndef $(PKG)_KCONFIG_FILE $(PKG)_KCONFIG_FILE = .config @@ -190,6 +190,18 @@ ifeq ($(PKG_MODE),KCONFIG) $(PKG)_KCONFIG_DOTCONFIG = $$($(PKG)_KCONFIG_FILE) endif +# auto-assign some dependencies +ifndef $(PKG)_DEPENDENCIES + $(PKG)_DEPENDENCIES = +endif +ifeq ($(PKG_MODE),MESON) + $(PKG)_DEPENDENCIES += host-meson +endif +ifeq ($(PKG_MODE),PYTHON3) + $(PKG)_DEPENDENCIES += host-python3 + $(PKG)_DEPENDENCIES += $$(if $$(filter $$(pkg),host-python-setuptools),,host-python-setuptools) +endif + endef # PKG_CHECK_VARIABLES pkg-check-variables = $(call PKG_CHECK_VARIABLES) diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 42483868..ab85ffdd 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -11,7 +11,5 @@ PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ea/a3/3d3cbbb71 # ----------------------------------------------------------------------------- -HOST_PYTHON_SETUPTOOLS_DEPENDENCIES = host-python3 - host-python-setuptools: | $(HOST_DIR) $(call host-python3-package)