commit 45bdb70e1ed411f24aae4624563d682a372f287c
parent fa76db66ef6947c34d0b34dc6aed73b11dc11803
Author: Alexandru Ardelean <ardeleanalex@gmail.com>
Date: Fri, 4 Nov 2016 10:35:03 +0200
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 <ardeleanalex@gmail.com>
Diffstat:
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git 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
@@ -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
