package/pkg-python: deduplicate common env/opts variables
PATCH v2 1/3 package/pkg-python: deduplicate common env/opts variables
There are many varibles shared via setuptools, distutils and pep517, combine those common env/opts variables to make them easier to maintain.
---
Changes v1 -> v2:
- restore accidentially dropped LDSHARED in distutils env
--- package/pkg-python.mk | 96 +++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 53 deletions(-)
package/pkg-python.mk +43 -53
@@ -33,78 +33,77 @@ PKG_PYTHON_HOST_PLATFORM = linux-$(PKG_PYTHON_ARCH) PKG_PYTHON_SYSCONFIGDATA_PATH = $(PYTHON3_PATH)/_sysconfigdata__linux_*.py PKG_PYTHON_SYSCONFIGDATA_NAME = `{ [ -e $(PKG_PYTHON_SYSCONFIGDATA_PATH) ] && basename $(PKG_PYTHON_SYSCONFIGDATA_PATH) .py; } || true` -# Target distutils-based packages -PKG_PYTHON_DISTUTILS_ENV = \ +# Target python packages +PKG_PYTHON_ENV = \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ + _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ - LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ - _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ - _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ _python_exec_prefix=/usr +# Host python packages +HOST_PKG_PYTHON_ENV = \ + PATH=$(BR_PATH) \ + PYTHONNOUSERSITE=1 \ + $(HOST_CONFIGURE_OPTS) + +# Target distutils-based packages +PKG_PYTHON_DISTUTILS_ENV = \ + $(PKG_PYTHON_ENV) \ + LDSHARED="$(TARGET_CROSS)gcc -shared" \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ + PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ --executable=/usr/bin/python -PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --prefix=/usr \ + --prefix=/usr + +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ + $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ --root=$(TARGET_DIR) PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ - --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --prefix=/usr \ + $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ --root=$(STAGING_DIR) # Host distutils-based packages HOST_PKG_PYTHON_DISTUTILS_ENV = \ - PATH=$(BR_PATH) \ - PYTHONNOUSERSITE=1 \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ - $(HOST_CONFIGURE_OPTS) + $(HOST_PKG_PYTHON_ENV) \ + SETUPTOOLS_USE_DISTUTILS=stdlib HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ - _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ - _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ - PATH=$(BR_PATH) \ - $(TARGET_CONFIGURE_OPTS) \ - PYTHONPATH="$(PYTHON3_PATH)" \ - PYTHONNOUSERSITE=1 \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr + $(PKG_PYTHON_ENV) \ + SETUPTOOLS_USE_DISTUTILS=stdlib -PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --executable=/usr/bin/python \ - --single-version-externally-managed \ + --single-version-externally-managed + +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ --root=$(TARGET_DIR) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ - --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --prefix=/usr \ - --executable=/usr/bin/python \ - --single-version-externally-managed \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ --root=$(STAGING_DIR) # Host setuptools-based packages HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ - PATH=$(BR_PATH) \ - PYTHONNOUSERSITE=1 \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ - $(HOST_CONFIGURE_OPTS) + $(HOST_PKG_PYTHON_ENV) \ + SETUPTOOLS_USE_DISTUTILS=stdlib HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) \
@@ -113,28 +112,21 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ # Target pep517-based packages PKG_PYTHON_PEP517_ENV = \ - _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ - _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ - PATH=$(BR_PATH) \ - $(TARGET_CONFIGURE_OPTS) \ - PYTHONPATH="$(PYTHON3_PATH)" \ - PYTHONNOUSERSITE=1 \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr + $(PKG_PYTHON_ENV) -PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=/usr/bin/python \ - --script-kind=posix \ + --script-kind=posix + +PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ - --interpreter=/usr/bin/python \ - --script-kind=posix \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \
@@ -142,9 +134,7 @@ PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ # Host pep517-based packages HOST_PKG_PYTHON_PEP517_ENV = \ - PATH=$(BR_PATH) \ - PYTHONNOUSERSITE=1 \ - $(HOST_CONFIGURE_OPTS) + $(HOST_PKG_PYTHON_ENV) HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 2/3 package/pkg-python: add setuptools-rust infrastructure
The setuptools-rust package infrastructure is essentially a variant of the setuptools package infrastructure which sets up the env and download hooks required for building setuptools-rust packages.
--- package/pkg-python.mk | 46 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-)
package/pkg-python.mk +43 -3
@@ -110,6 +110,24 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --root=/ \ --single-version-externally-managed +# Target setuptools-rust-based packages +PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ + $(PKG_PYTHON_SETUPTOOLS_ENV) \ + $(PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" + +PKG_PYTHON_SETUPTOOLS_RUST_DL_ENV = \ + $(PKG_CARGO_ENV) + +# Host setuptools-rust-based packages +HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ + $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ + $(HOST_PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" + +HOST_PKG_PYTHON_SETUPTOOLS_RUST_DL_ENV = \ + $(HOST_PKG_CARGO_ENV) + # Target pep517-based packages PKG_PYTHON_PEP517_ENV = \ $(PKG_PYTHON_ENV)
@@ -177,14 +195,30 @@ $(2)_BASE_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) endif # Setuptools -else ifeq ($$($(2)_SETUP_TYPE),setuptools) +else ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) +ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) +$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_RUST_ENV) +$(2)_DL_ENV = $$(PKG_PYTHON_SETUPTOOLS_RUST_DL_ENV) +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_CARGO_MANIFEST_PATH) +else $(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) +endif $(2)_BASE_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) $(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else +ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV) +$(2)_DL_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_RUST_DL_ENV) +ifndef $(2)_CARGO_MANIFEST_PATH +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(3)_CARGO_MANIFEST_PATH) +else +$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_CARGO_MANIFEST_PATH) +endif +else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) +endif $(2)_BASE_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif
@@ -208,7 +242,7 @@ $(2)_BASE_BUILD_CMD = -m flit_core.wheel $(2)_BASE_INSTALL_CMD ?= -m installer dist/* endif else -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") +$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'setuptools-rust', 'pep517' or 'flit'.") endif # Target packages need both the python interpreter on the target (for
@@ -225,8 +259,14 @@ endif # ($(4),target) # Setuptools based packages will need setuptools for the host Python # interpreter (both host and target). # -ifeq ($$($(2)_SETUP_TYPE),setuptools) +ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) +ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) +$(2)_DEPENDENCIES += host-python-setuptools-rust host-rustc +# We need to vendor the Cargo crates at download time +$(2)_DOWNLOAD_POST_PROCESS = cargo +$(2)_DOWNLOAD_DEPENDENCIES = host-rustc +endif else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) $(2)_DEPENDENCIES += host-python-pypa-build host-python-installer ifeq ($$($(2)_SETUP_TYPE),flit)
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 3/3 package/python-cryptography: migrate to setuptools-rust infrastructure
In reply to James HilliardWe can now significantly simplify the python-cryptography build using the new setuptools-rust setup type introduced in the python package infrastructure.
--- .../python-cryptography.mk | 30 +++---------------- 1 file changed, 4 insertions(+), 26 deletions(-)
package/python-cryptography/python-cryptography.mk +4 -26
@@ -7,36 +7,14 @@ PYTHON_CRYPTOGRAPHY_VERSION = 37.0.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/3d/5f/addb8b91fd356792d28e59a8275fec833323cb28604fb3a497c35d7cf0a3 -PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools +PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools-rust PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography -PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ - host-python-setuptools-rust \ - host-python-cffi \ - host-rustc \ - openssl -HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ - host-python-setuptools-rust \ - host-python-cffi \ - host-rustc \ - host-openssl -PYTHON_CRYPTOGRAPHY_ENV = \ - $(PKG_CARGO_ENV) \ - PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" -HOST_PYTHON_CRYPTOGRAPHY_ENV = \ - $(HOST_PKG_CARGO_ENV) \ - PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" -# We need to vendor the Cargo crates at download time -PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo -PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc -PYTHON_CRYPTOGRAPHY_DL_ENV = \ - $(PKG_CARGO_ENV) \ - BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml -HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \ - $(HOST_PKG_CARGO_ENV) \ - BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml +PYTHON_CRYPTOGRAPHY_CARGO_MANIFEST_PATH = src/rust/Cargo.toml +PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi host-openssl $(eval $(python-package)) $(eval $(host-python-package))
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Arnout Vandecappelle
AppliedQuoted 5 lines · James Hilliard
There are many varibles shared via setuptools, distutils and pep517, combine those common env/opts variables to make them easier to maintain.
Signed-off-by James Hilliard <[email protected]>
Applied to master, thanks.
Regards,
Arnout
Quoted 162 lines
---
Changes v1 -> v2:
- restore accidentially dropped LDSHARED in distutils env--- package/pkg-python.mk | 96 +++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 53 deletions(-)package/pkg-python.mk +42
-50@@ -33,78 +33,77 @@ PKG_PYTHON_HOST_PLATFORM = linux-$(PKG_PYTHON_ARCH) PKG_PYTHON_SYSCONFIGDATA_PATH = $(PYTHON3_PATH)/_sysconfigdata__linux_*.py PKG_PYTHON_SYSCONFIGDATA_NAME = `{ [ -e $(PKG_PYTHON_SYSCONFIGDATA_PATH) ] && basename $(PKG_PYTHON_SYSCONFIGDATA_PATH) .py; } || true` -# Target distutils-based packages -PKG_PYTHON_DISTUTILS_ENV = \ +# Target python packages +PKG_PYTHON_ENV = \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ + _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ - LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ - _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ - _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ _python_exec_prefix=/usr +# Host python packages +HOST_PKG_PYTHON_ENV = \ + PATH=$(BR_PATH) \ + PYTHONNOUSERSITE=1 \ + $(HOST_CONFIGURE_OPTS) + +# Target distutils-based packages +PKG_PYTHON_DISTUTILS_ENV = \ + $(PKG_PYTHON_ENV) \ + LDSHARED="$(TARGET_CROSS)gcc -shared" \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ + PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ --executable=/usr/bin/python -PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --prefix=/usr \ + --prefix=/usr + +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ + $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ --root=$(TARGET_DIR) PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ - --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --prefix=/usr \ + $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ --root=$(STAGING_DIR) # Host distutils-based packages HOST_PKG_PYTHON_DISTUTILS_ENV = \ - PATH=$(BR_PATH) \ - PYTHONNOUSERSITE=1 \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ - $(HOST_CONFIGURE_OPTS) + $(HOST_PKG_PYTHON_ENV) \ + SETUPTOOLS_USE_DISTUTILS=stdlib HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ - _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ - _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ - PATH=$(BR_PATH) \ - $(TARGET_CONFIGURE_OPTS) \ - PYTHONPATH="$(PYTHON3_PATH)" \ - PYTHONNOUSERSITE=1 \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr + $(PKG_PYTHON_ENV) \ + SETUPTOOLS_USE_DISTUTILS=stdlib -PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --executable=/usr/bin/python \ - --single-version-externally-managed \ + --single-version-externally-managed + +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ --root=$(TARGET_DIR) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ - --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --prefix=/usr \ - --executable=/usr/bin/python \ - --single-version-externally-managed \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ --root=$(STAGING_DIR) # Host setuptools-based packages HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ - PATH=$(BR_PATH) \ - PYTHONNOUSERSITE=1 \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ - $(HOST_CONFIGURE_OPTS) + $(HOST_PKG_PYTHON_ENV) \ + SETUPTOOLS_USE_DISTUTILS=stdlib HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) \@@ -113,28 +112,21 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ # Target pep517-based packages PKG_PYTHON_PEP517_ENV = \ - _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ - _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ - PATH=$(BR_PATH) \ - $(TARGET_CONFIGURE_OPTS) \ - PYTHONPATH="$(PYTHON3_PATH)" \ - PYTHONNOUSERSITE=1 \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr + $(PKG_PYTHON_ENV) -PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=/usr/bin/python \ - --script-kind=posix \ + --script-kind=posix + +PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ - --interpreter=/usr/bin/python \ - --script-kind=posix \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(STAGING_DIR)/usr/bin \
package/pkg-python.mk PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ · line 140
Quoted 10 lines
package/pkg-python.mk +1
-3@@ -142,9 +134,7 @@ PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ # Host pep517-based packages HOST_PKG_PYTHON_PEP517_ENV = \ - PATH=$(BR_PATH) \ - PYTHONNOUSERSITE=1 \ - $(HOST_CONFIGURE_OPTS) + $(HOST_PKG_PYTHON_ENV) HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot