Browse Source

Merge pull request #5342 from commodo/python-host-zlib

python,python3: add zlib/host to HOST_BUILD_DEPENDS (ver 2)
lilik-openwrt-22.03
Hannu Nyman 7 years ago
committed by GitHub
parent
commit
b34cd50cdc
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
  1. +2
    -4
      lang/python/python/Makefile
  2. +2
    -2
      lang/python/python3/Makefile

+ 2
- 4
lang/python/python/Makefile View File

@ -12,9 +12,7 @@ include ./files/python-version.mk
PKG_NAME:=python PKG_NAME:=python
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
# XXX: reset PKG_RELEASE to 1 only if Python's pip & setuptools versions have also bumped;
# otherwise, keep bumping PKG_RELEASE
PKG_RELEASE:=6
PKG_RELEASE:=7
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION) PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
@ -42,7 +40,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PYTHON_BLUETOOTH_SUPPORT CONFIG_PYTHON_BLUETOOTH_SUPPORT
PKG_BUILD_DEPENDS:=python/host PKG_BUILD_DEPENDS:=python/host
HOST_BUILD_DEPENDS:=bzip2/host expat/host
HOST_BUILD_DEPENDS:=bzip2/host expat/host zlib/host
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk


+ 2
- 2
lang/python/python3/Makefile View File

@ -14,7 +14,7 @@ PYTHON_VERSION:=$(PYTHON3_VERSION)
PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO) PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
PKG_NAME:=python3 PKG_NAME:=python3
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
@ -43,7 +43,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PYTHON3_BLUETOOTH_SUPPORT CONFIG_PYTHON3_BLUETOOTH_SUPPORT
PKG_BUILD_DEPENDS:=python3/host PKG_BUILD_DEPENDS:=python3/host
HOST_BUILD_DEPENDS:=bzip2/host expat/host libffi/host
HOST_BUILD_DEPENDS:=bzip2/host expat/host libffi/host zlib/host
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk


Loading…
Cancel
Save