Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

python: move PYTHON_VERSION in own .mk file

Browse source 
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:
Alexandru Ardelean 2016-11-07 09:31:18 +02:00
parent 45bdb70e1e
commit 6a670f42b1
4 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lang/python/Makefile
View file

@ -7,10 +7,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
# For PYTHON_VERSION
include ./files/python-version.mk
# This file provides the necsessary host build variables # This file provides the necsessary host build variables
include ./files/python-host.mk include ./files/python-host.mk
# The file included below defines PYTHON_VERSION # For PyPackage
include ./files/python-package.mk include ./files/python-package.mk
PKG_NAME:=python PKG_NAME:=python
@ -142,6 +145,7 @@ define Build/InstallDev
$(INSTALL_DATA) \ $(INSTALL_DATA) \
./files/python-package.mk \ ./files/python-package.mk \
./files/python-host.mk \ ./files/python-host.mk \
./files/python-version.mk \
$(STAGING_DIR)/mk/ $(STAGING_DIR)/mk/
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \

3
lang/python/files/python-host.mk
View file

@ -8,6 +8,9 @@
ifneq ($(__python_host_mk_inc),1) ifneq ($(__python_host_mk_inc),1)
__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 # 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)

3
lang/python/files/python-package.mk
View file

@ -5,8 +5,7 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
PYTHON_VERSION:=2.7 $(call include_mk, python-version.mk)
PYTHON_VERSION_MICRO:=12
PYTHON_DIR:=$(STAGING_DIR)/usr PYTHON_DIR:=$(STAGING_DIR)/usr
PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin

10
lang/python/files/python-version.mk Normal file
View 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