Merge pull request #4371 from commodo/fix-pip3

python3-pip: fix package ; it was broken

lang/python/python/files/python-package.mk

@@ -61,6 +61,7 @@ define PyPackage
     endef
   endif
 
+  ifndef Package/$(1)/install
   $(call shexport,PyPackage/$(1)/filespec)
 
   define Package/$(1)/install
@@ -85,6 +86,7 @@ define PyPackage
   define Package/$(1)-src/install
 	$$(call Package/$(1)/install,$$(1),sources)
   endef
+  endif # Package/$(1)/install
 endef
 
 $(call include_mk, python-host.mk)

lang/python/python3/Makefile

@@ -14,7 +14,7 @@ PYTHON_VERSION:=$(PYTHON3_VERSION)
 PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
 
 PKG_NAME:=python3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz

lang/python/python3/files/python3-package-pip.mk

@@ -12,7 +12,7 @@ $(call Package/python3/Default)
   DEPENDS:=+python3 +python3-setuptools +python-pip-conf
 endef
 
-define Py3Package/python3-pip/install
+define Package/python3-pip/install
 	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages
 	# Adjust shebang to proper python location on target
 	sed "1s/.*/#\!\/usr\/bin\/python$(PYTHON3_VERSION)/" -i $(PKG_BUILD_DIR)/install-pip/bin/*
@@ -20,6 +20,7 @@ define Py3Package/python3-pip/install
 	$(CP) \
 		$(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON3_VERSION)/site-packages/pip \
 		$(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/
+	find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -name __pycache__ | xargs rm -rf
 endef
 
 $(eval $(call Py3BasePackage,python3-pip, \

lang/python/python3/files/python3-package-setuptools.mk

@@ -23,6 +23,7 @@ define Py3Package/python3-setuptools/install
 		$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/setuptools \
 		$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/easy_install.py \
 		$(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages
+	find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -name __pycache__ | xargs rm -rf
 endef
 
 $(eval $(call Py3BasePackage,python3-setuptools, \

lang/python/python3/files/python3-package.mk

@@ -61,6 +61,7 @@ define Py3Package
     endef
   endif
 
+  ifndef Package/$(1)/install
   $(call shexport,Py3Package/$(1)/filespec)
 
   define Package/$(1)/install
@@ -85,6 +86,7 @@ define Py3Package
   define Package/$(1)-src/install
 	$$(call Package/$(1)/install,$$(1),sources)
   endef
+  endif # Package/$(1)/install
 endef
 
 $(call include_mk, python3-host.mk)