mirror of
https://github.com/openwrt/packages.git
synced 2025-12-26 11:16:31 +04:00
python: move PYTHON_VERSION in own .mk file
Allows for more granularity with respect to python-host.mk and python-package.mk inclusions. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
@@ -7,10 +7,13 @@
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
# For PYTHON_VERSION
|
||||
include ./files/python-version.mk
|
||||
|
||||
# This file provides the necsessary host build variables
|
||||
include ./files/python-host.mk
|
||||
|
||||
# The file included below defines PYTHON_VERSION
|
||||
# For PyPackage
|
||||
include ./files/python-package.mk
|
||||
|
||||
PKG_NAME:=python
|
||||
@@ -142,6 +145,7 @@ define Build/InstallDev
|
||||
$(INSTALL_DATA) \
|
||||
./files/python-package.mk \
|
||||
./files/python-host.mk \
|
||||
./files/python-version.mk \
|
||||
$(STAGING_DIR)/mk/
|
||||
$(CP) \
|
||||
$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
ifneq ($(__python_host_mk_inc),1)
|
||||
__python_host_mk_inc=1
|
||||
|
||||
# For PYTHON_VERSION
|
||||
$(call include_mk, python-version.mk)
|
||||
|
||||
# Compatibility fallback for older OpenWrt and LEDE versions
|
||||
ifeq ($(STAGING_DIR_HOSTPKG),)
|
||||
$(warning STAGING_DIR_HOSTPKG is unset - falling back to $$(STAGING_DIR)/host)
|
||||
|
||||
@@ -5,8 +5,7 @@
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
PYTHON_VERSION:=2.7
|
||||
PYTHON_VERSION_MICRO:=12
|
||||
$(call include_mk, python-version.mk)
|
||||
|
||||
PYTHON_DIR:=$(STAGING_DIR)/usr
|
||||
PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin
|
||||
|
||||
10
lang/python/files/python-version.mk
Normal file
10
lang/python/files/python-version.mk
Normal file
@@ -0,0 +1,10 @@
|
||||
#
|
||||
# Copyright (C) 2016 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
PYTHON_VERSION:=2.7
|
||||
PYTHON_VERSION_MICRO:=12
|
||||
|
||||
Reference in New Issue
Block a user