diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2017-07-03 15:17:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-03 15:17:46 +0200 |
| commit | 2d7cab05f2ef7fae499e52ca38b5de65e2a4f5fe (patch) | |
| tree | c1bdf71f962ae243a45854935a17975c9ffa0cf4 /lang/python | |
| parent | 23fe240f37046562daa24f086428a8f84ed2b9b6 (diff) | |
| parent | 3fa0c06d48acbbc94a58d4bbcd03345539451a70 (diff) | |
Merge pull request #4538 from commodo/python-updates
python,python3: minor build improvements
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/python/Makefile | 3 | ||||
| -rw-r--r-- | lang/python/python/files/python-package-pip.mk | 2 | ||||
| -rw-r--r-- | lang/python/python/files/python-package-setuptools.mk | 2 | ||||
| -rw-r--r-- | lang/python/python3/Makefile | 3 | ||||
| -rw-r--r-- | lang/python/python3/files/python3-package-pip.mk | 2 | ||||
| -rw-r--r-- | lang/python/python3/files/python3-package-setuptools.mk | 2 |
6 files changed, 10 insertions, 4 deletions
diff --git a/lang/python/python/Makefile b/lang/python/python/Makefile index 1d37a51d8..d4c657b4f 100644 --- a/lang/python/python/Makefile +++ b/lang/python/python/Makefile @@ -35,6 +35,8 @@ HOST_BUILD_PARALLEL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION) +PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_python-setuptools CONFIG_PACKAGE_python-pip + PKG_BUILD_DEPENDS:=python/host HOST_BUILD_DEPENDS:=bzip2/host expat/host @@ -276,6 +278,7 @@ define Package/python-pip-conf/install endef HOST_LDFLAGS += \ + -Wl,--no-as-needed -lrt \ $$$$(pkg-config --static --libs libcrypto libssl) HOST_CONFIGURE_ARGS+= \ diff --git a/lang/python/python/files/python-package-pip.mk b/lang/python/python/files/python-package-pip.mk index 8dd0d6c79..a3934cc19 100644 --- a/lang/python/python/files/python-package-pip.mk +++ b/lang/python/python/files/python-package-pip.mk @@ -15,7 +15,7 @@ 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/* + 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 \ diff --git a/lang/python/python/files/python-package-setuptools.mk b/lang/python/python/files/python-package-setuptools.mk index 48823731e..c35fad8c5 100644 --- a/lang/python/python/files/python-package-setuptools.mk +++ b/lang/python/python/files/python-package-setuptools.mk @@ -15,7 +15,7 @@ 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/* + 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 \ diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 9e10d1806..02c103193 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -38,6 +38,8 @@ HOST_BUILD_PARALLEL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION) +PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_python3-setuptools CONFIG_PACKAGE_python3-pip + PKG_BUILD_DEPENDS:=python3/host HOST_BUILD_DEPENDS:=bzip2/host expat/host libffi/host @@ -251,6 +253,7 @@ define Py3Package/python3/filespec endef HOST_LDFLAGS += \ + -Wl,--no-as-needed -lrt \ $$$$(pkg-config --static --libs libcrypto libssl) HOST_CONFIGURE_ARGS+= \ diff --git a/lang/python/python3/files/python3-package-pip.mk b/lang/python/python3/files/python3-package-pip.mk index 43e05f1c7..ff9b5ac74 100644 --- a/lang/python/python3/files/python3-package-pip.mk +++ b/lang/python/python3/files/python3-package-pip.mk @@ -15,7 +15,7 @@ endef 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/* + sed "1s@.*@#\!/usr/bin/python$(PYTHON3_VERSION)@" -i $(PKG_BUILD_DIR)/install-pip/bin/* $(CP) $(PKG_BUILD_DIR)/install-pip/bin/pip3* $(1)/usr/bin $(CP) \ $(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON3_VERSION)/site-packages/pip \ diff --git a/lang/python/python3/files/python3-package-setuptools.mk b/lang/python/python3/files/python3-package-setuptools.mk index 9a646334f..684d3e64e 100644 --- a/lang/python/python3/files/python3-package-setuptools.mk +++ b/lang/python/python3/files/python3-package-setuptools.mk @@ -15,7 +15,7 @@ endef define Py3Package/python3-setuptools/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-setuptools/bin/* + sed "1s@.*@#\!/usr/bin/python$(PYTHON3_VERSION)@" -i $(PKG_BUILD_DIR)/install-setuptools/bin/* $(CP) $(PKG_BUILD_DIR)/install-setuptools/bin/easy_install-* $(1)/usr/bin $(LN) easy_install-$(PYTHON3_VERSION) $(1)/usr/bin/easy_install-3 $(CP) \ |