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

Merge pull request #3661 from commodo/python3-move-includes

Browse source 
python3: split `python3-version.mk` from `python3-package.mk`
This commit is contained in:
Hannu Nyman 2016-12-16 10:41:14 +02:00 committed by GitHub
commit 8fec0e4eb2
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lang/python3/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
# The file included below defines PYTHON_VERSION # The file included below defines PYTHON_VERSION
include ./files/python3-package.mk include ./files/python3-version.mk
PYTHON_VERSION:=$(PYTHON3_VERSION) PYTHON_VERSION:=$(PYTHON3_VERSION)
PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO) PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
@ -24,6 +24,8 @@ PKG_MD5SUM:=8906efbacfcdc7c3c9198aeefafd159e
PKG_LICENSE:=PSF PKG_LICENSE:=PSF
PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
include ./files/python3-package.mk
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
@ -141,7 +143,10 @@ define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR)/mk/ $(INSTALL_DIR) $(STAGING_DIR)/mk/
$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/ $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
$(INSTALL_DATA) ./files/python3-package.mk $(STAGING_DIR)/mk/ $(INSTALL_DATA) \
./files/python3-package.mk \
./files/python3-version.mk \
$(STAGING_DIR)/mk/
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
$(1)/usr/include/ $(1)/usr/include/

6
lang/python3/files/python3-package.mk
View file

@ -11,11 +11,7 @@ ifeq ($(STAGING_DIR_HOSTPKG),)
STAGING_DIR_HOSTPKG := $(STAGING_DIR)/host STAGING_DIR_HOSTPKG := $(STAGING_DIR)/host
endif endif
PYTHON3_VERSION_MAJOR:=3 $(call include_mk, python3-version.mk)
PYTHON3_VERSION_MINOR:=5
PYTHON3_VERSION_MICRO:=2
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
PYTHON3_DIR:=$(STAGING_DIR)/usr PYTHON3_DIR:=$(STAGING_DIR)/usr
PYTHON3_BIN_DIR:=$(PYTHON3_DIR)/bin PYTHON3_BIN_DIR:=$(PYTHON3_DIR)/bin

13
lang/python3/files/python3-version.mk Normal file
View file

@ -0,0 +1,13 @@
#
# Copyright (C) 2007-2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
PYTHON3_VERSION_MAJOR:=3
PYTHON3_VERSION_MINOR:=5
PYTHON3_VERSION_MICRO:=2
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)