commit 8fec0e4eb29ab2b049545d2af341745f47a13d8d
parent c2f712935d272dcf23cb58497a74988a5624e0ed
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date: Fri, 16 Dec 2016 10:41:14 +0200
Merge pull request #3661 from commodo/python3-move-includes
python3: split `python3-version.mk` from `python3-package.mk`
Diffstat:
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/lang/python3/Makefile b/lang/python3/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
# The file included below defines PYTHON_VERSION
-include ./files/python3-package.mk
+include ./files/python3-version.mk
PYTHON_VERSION:=$(PYTHON3_VERSION)
PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
@@ -24,6 +24,8 @@ PKG_MD5SUM:=8906efbacfcdc7c3c9198aeefafd159e
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
+include ./files/python3-package.mk
+
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
HOST_BUILD_PARALLEL:=1
@@ -141,7 +143,10 @@ define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR)/mk/
$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/
$(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) \
$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
$(1)/usr/include/
diff --git a/lang/python3/files/python3-package.mk b/lang/python3/files/python3-package.mk
@@ -11,11 +11,7 @@ ifeq ($(STAGING_DIR_HOSTPKG),)
STAGING_DIR_HOSTPKG := $(STAGING_DIR)/host
endif
-PYTHON3_VERSION_MAJOR:=3
-PYTHON3_VERSION_MINOR:=5
-PYTHON3_VERSION_MICRO:=2
-
-PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
+$(call include_mk, python3-version.mk)
PYTHON3_DIR:=$(STAGING_DIR)/usr
PYTHON3_BIN_DIR:=$(PYTHON3_DIR)/bin
diff --git a/lang/python3/files/python3-version.mk b/lang/python3/files/python3-version.mk
@@ -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)
+
