From 45bdb70e1ed411f24aae4624563d682a372f287c Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Fri, 4 Nov 2016 10:35:03 +0200 Subject: [PATCH] python: add include guard for python-host.mk and include in Makefile So that it can be included twice. python-package.mk include python-host.mk, but at some point in time python-host.mk is not exported to staging_dir yet. So, to have in python's Makefile, we need to include it in the Makefile, and to prevent double inclusion (if python-host.mk is exported from a previous build), the include guard is added. Also, moved the includes after some vars were set. Signed-off-by: Alexandru Ardelean --- lang/python/Makefile | 3 +++ lang/python/files/python-host.mk | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/lang/python/Makefile b/lang/python/Makefile index c333f8e08..336c3b0a6 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -7,6 +7,9 @@ include $(TOPDIR)/rules.mk +# This file provides the necsessary host build variables +include ./files/python-host.mk + # The file included below defines PYTHON_VERSION include ./files/python-package.mk diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk index 0a5eb4193..da24f3dc1 100644 --- a/lang/python/files/python-host.mk +++ b/lang/python/files/python-host.mk @@ -5,6 +5,9 @@ # See /LICENSE for more information. # +ifneq ($(__python_host_mk_inc),1) +__python_host_mk_inc=1 + # Compatibility fallback for older OpenWrt and LEDE versions ifeq ($(STAGING_DIR_HOSTPKG),) $(warning STAGING_DIR_HOSTPKG is unset - falling back to $$(STAGING_DIR)/host) @@ -71,3 +74,4 @@ define Build/Compile/HostPyMod $(3)) endef +endif # __python_host_mk_inc