mirror of
https://github.com/novatiq/packages.git
synced 2026-04-29 06:58:39 +01:00
pip,setuptools: move as part of python,python3 build
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
+30
-2
@@ -12,7 +12,7 @@ include ./files/python-version.mk
|
||||
|
||||
PKG_NAME:=python
|
||||
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
|
||||
@@ -92,7 +92,9 @@ define PyBasePackage
|
||||
endif
|
||||
PYTHON_LIB_FILES_DEL+=$(2)
|
||||
define PyPackage/$(1)/filespec
|
||||
$(subst $(space),$(newline),$(foreach lib_file,$(2),+|$(lib_file)))
|
||||
ifneq ($(2),)
|
||||
$(subst $(space),$(newline),$(foreach lib_file,$(2),+|$(lib_file)))
|
||||
endif
|
||||
endef
|
||||
endef
|
||||
|
||||
@@ -136,6 +138,7 @@ CONFIGURE_ARGS+= \
|
||||
--without-cxx-main \
|
||||
--with-threads \
|
||||
--with-system-ffi \
|
||||
--with-ensurepip=no \
|
||||
--without-pymalloc \
|
||||
PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)" \
|
||||
$(ENABLE_IPV6) \
|
||||
@@ -147,6 +150,31 @@ define Build/Prepare
|
||||
$(CP) ./files/config.site $(PKG_BUILD_DIR)/config.site
|
||||
endef
|
||||
|
||||
ifdef CONFIG_PACKAGE_python-setuptools
|
||||
define Build/Compile/python-setuptools
|
||||
$(STAGING_DIR_HOSTPKG)/bin/pip install \
|
||||
--ignore-installed \
|
||||
--root=$(PKG_BUILD_DIR)/install-setuptools --prefix=. \
|
||||
$(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/setuptools-*.whl
|
||||
endef
|
||||
endif # CONFIG_PACKAGE_python-setuptools
|
||||
|
||||
ifdef CONFIG_PACKAGE_python-pip
|
||||
define Build/Compile/python-pip
|
||||
$(STAGING_DIR_HOSTPKG)/bin/pip install \
|
||||
--ignore-installed \
|
||||
--root=$(PKG_BUILD_DIR)/install-pip --prefix=. \
|
||||
$(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/pip-*.whl
|
||||
endef
|
||||
endif # CONFIG_PACKAGE_python-pip
|
||||
|
||||
define Build/Compile
|
||||
$(call Build/Compile/Default)
|
||||
# Use host pip to install python-setuptools
|
||||
$(call Build/Compile/python-setuptools)
|
||||
$(call Build/Compile/python-pip)
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(STAGING_DIR)/mk/
|
||||
$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/ $(1)/usr/lib/pkgconfig
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
#
|
||||
# Copyright (C) 2017 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
define Package/python-pip
|
||||
$(call Package/python/Default)
|
||||
TITLE:=Python $(PYTHON_VERSION) pip module
|
||||
DEPENDS:=+python +python-setuptools
|
||||
endef
|
||||
|
||||
define PyPackage/python-pip/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/python$(PYTHON_VERSION)/site-packages
|
||||
# Adjust shebang to proper python location on target
|
||||
sed "1s/.*/#\!\/usr\/bin\/python$(PYTHON_VERSION)/" -i $(PKG_BUILD_DIR)/install-pip/bin/*
|
||||
$(CP) $(PKG_BUILD_DIR)/install-pip/bin/* $(1)/usr/bin
|
||||
$(CP) \
|
||||
$(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON_VERSION)/site-packages/pip \
|
||||
$(1)/usr/lib/python$(PYTHON_VERSION)/site-packages/
|
||||
endef
|
||||
|
||||
$(eval $(call PyBasePackage,python-pip, \
|
||||
, \
|
||||
DO_NOT_ADD_TO_PACKAGE_DEPENDS \
|
||||
))
|
||||
@@ -0,0 +1,29 @@
|
||||
#
|
||||
# Copyright (C) 2017 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
define Package/python-setuptools
|
||||
$(call Package/python/Default)
|
||||
TITLE:=Python $(PYTHON_VERSION) setuptools module
|
||||
DEPENDS:=+python
|
||||
endef
|
||||
|
||||
define PyPackage/python-setuptools/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/python$(PYTHON_VERSION)/site-packages
|
||||
# Adjust shebang to proper python location on target
|
||||
sed "1s/.*/#\!\/usr\/bin\/python$(PYTHON_VERSION)/" -i $(PKG_BUILD_DIR)/install-setuptools/bin/*
|
||||
$(CP) $(PKG_BUILD_DIR)/install-setuptools/bin/* $(1)/usr/bin
|
||||
$(CP) \
|
||||
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/pkg_resources \
|
||||
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/setuptools \
|
||||
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/easy_install.py \
|
||||
$(1)/usr/lib/python$(PYTHON_VERSION)/site-packages
|
||||
endef
|
||||
|
||||
$(eval $(call PyBasePackage,python-setuptools, \
|
||||
, \
|
||||
DO_NOT_ADD_TO_PACKAGE_DEPENDS \
|
||||
))
|
||||
Reference in New Issue
Block a user