mirror of
https://github.com/novatiq/packages.git
synced 2026-04-28 14:48:39 +01:00
Merge pull request #4538 from commodo/python-updates
python,python3: minor build improvements
This commit is contained in:
@@ -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+= \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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+= \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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) \
|
||||
|
||||
Reference in New Issue
Block a user