openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-22 16:54:32 +04:00
Code Issues Packages Projects Releases Wiki Activity

python: add include guard for python-host.mk and include in Makefile

Browse Source 
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>
This commit is contained in:
Alexandru Ardelean
2016-11-04 10:35:03 +02:00
parent fa76db66ef
commit 45bdb70e1e
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lang/python/Makefile
View File

@@ -7,6 +7,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
# This file provides the necsessary host build variables
include ./files/python-host.mk
# The file included below defines PYTHON_VERSION # The file included below defines PYTHON_VERSION
include ./files/python-package.mk include ./files/python-package.mk

4
lang/python/files/python-host.mk
View File

@@ -5,6 +5,9 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
ifneq ($(__python_host_mk_inc),1)
__python_host_mk_inc=1
# Compatibility fallback for older OpenWrt and LEDE versions # Compatibility fallback for older OpenWrt and LEDE versions
ifeq ($(STAGING_DIR_HOSTPKG),) ifeq ($(STAGING_DIR_HOSTPKG),)
$(warning STAGING_DIR_HOSTPKG is unset - falling back to $$(STAGING_DIR)/host) $(warning STAGING_DIR_HOSTPKG is unset - falling back to $$(STAGING_DIR)/host)
@@ -71,3 +74,4 @@ define Build/Compile/HostPyMod
$(3)) $(3))
endef endef
endif # __python_host_mk_inc