python,python3: install built-in pip and setuptools

Easier than using external package.

Signed-off-by: Alexandru Ardelean <redacted>

diff --git a/lang/python-pip/Makefile b/lang/python-pip/Makefile
index 2099e63a95c3b2ae073c37f4dde5d362a5e9b178..b20177887c9a457a7491429c1ee21c2bf6eb4216 100644 (file)
--- a/lang/python-pip/Makefile
+++ b/lang/python-pip/Makefile
@@ -17,16 +17,10 @@ PKG_MD5SUM:=87083c0b9867963b29f7aba3613e8f4a
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/python-pip-$(PKG_VERSION)
 PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/python-pip-$(PKG_VERSION)
-HOST_UNPACK=$(HOST_TAR) -C $(HOST_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
 PKG_USE_MIPS16:=0
 
-HOST_BUILD_DEPENDS:=python python/host python-setuptools/host
-
-include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 $(call include_mk, python-package.mk)
-$(call include_mk, python-host.mk)
 
 define Package/python-pip
   SUBMENU:=Python
@@ -60,17 +54,5 @@ define PyPackage/python-pip/install
        $(INSTALL_CONF) ./files/pip.conf $(1)/etc/
 endef
 
-define Host/Compile
-       $(call Build/Compile/HostPyMod,,\
-               install --root="$(STAGING_DIR_HOSTPKG)" --prefix="" \
-               --single-version-externally-managed \
-       )
-endef
-
-define Host/Install
-endef
-
-$(eval $(call HostBuild))
-
 $(eval $(call PyPackage,python-pip))
 $(eval $(call BuildPackage,python-pip))

diff --git a/lang/python-setuptools/Makefile b/lang/python-setuptools/Makefile
index 1f312229f9b34233c9d0908db28be9f2af8437e9..8a714514d5a94c50c73466bbe1df4967bcf2c2a0 100644 (file)
--- a/lang/python-setuptools/Makefile
+++ b/lang/python-setuptools/Makefile
@@ -15,18 +15,11 @@ PKG_SOURCE:=setuptools-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://pypi.python.org/packages/87/ba/54197971d107bc06f5f3fbdc0d728a7ae0b10cafca46acfddba65a0899d8/
 PKG_MD5SUM:=b39715612fdc0372dbfd7b3fcf5d4fe5
 
-HOST_BUILD_DEPENDS:=python python/host
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
 
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
-HOST_UNPACK=$(HOST_TAR) -C $(HOST_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
-
-include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 $(call include_mk, python-package.mk)
-$(call include_mk, python-host.mk)
 
 define Package/python-setuptools
   SUBMENU:=Python
@@ -61,18 +54,6 @@ define PyPackage/python-setuptools/install
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
 endef
 
-define Host/Compile
-       $(call Build/Compile/HostPyMod,,\
-               install --root="$(STAGING_DIR_HOSTPKG)" --prefix="" \
-               --single-version-externally-managed \
-       )
-endef
-
-define Host/Install
-endef
-
-$(eval $(call HostBuild))
-
 $(eval $(call PyPackage,python-setuptools))
 $(eval $(call BuildPackage,python-setuptools))
 

diff --git a/lang/python/Makefile b/lang/python/Makefile
index 6307dc3a5c87a5857ba8fde3b75ff27530c2a61b..c3f26800a9425f601e232fb9b87478d221b723d4 100644 (file)
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -240,6 +240,7 @@ HOST_CONFIGURE_ARGS+= \
        --exec-prefix=$(HOST_PYTHON_DIR) \
        --with-system-expat=$(STAGING_DIR_HOSTPKG) \
        --with-system-ffi=no \
+       --with-ensurepip=install \
        CONFIG_SITE=
 
 define Host/Install

diff --git a/lang/python3/Makefile b/lang/python3/Makefile
index 81e6679f8c8f4e63dc73243ec8b8b7541355c11c..2899b86c150aba09863864405c3d9eeac0bc2eb0 100644 (file)
--- a/lang/python3/Makefile
+++ b/lang/python3/Makefile
@@ -238,7 +238,7 @@ HOST_CONFIGURE_ARGS+= \
        --exec-prefix=$(HOST_PYTHON3_DIR) \
        --with-system-expat=$(STAGING_DIR_HOSTPKG) \
        --with-system-ffi=no \
-       --with-ensurepip=no \
+       --with-ensurepip=install \
        CONFIG_SITE=
 
 define Host/Compile